Auto merge of #25999 - servo-wpt-sync:wpt_update_20-03-2020, r=servo-wpt-sync

Sync WPT with upstream (20-03-2020)

Automated downstream sync of changes from upstream as of 20-03-2020.
[no-wpt-sync]
r? @servo-wpt-sync

1201 files changed, 21695 insertions, 20057 deletions

diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
new file mode 100644
index 00000000000..e35a452a186
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -0,0 +1,2 @@
+[no-transition-from-ua-to-blocking-stylesheet.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-substitution-variable-declaration.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-substitution-variable-declaration.html.ini
new file mode 100644
index 00000000000..9e37f672721
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-substitution-variable-declaration.html.ini
@@ -0,0 +1,4 @@
+[variable-substitution-variable-declaration.html]
+  [target10 --varC]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
new file mode 100644
index 00000000000..5170c0bda67
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
@@ -0,0 +1,10 @@
+[variables-substitute-guaranteed-invalid.html]
+  [Custom properties in a cycle are guaranteed-invalid]
+    expected: FAIL
+
+  [A custom property referencing a cycle is treated as unset]
+    expected: FAIL
+
+  [A custom property referencing a non-existent variable is treated as unset]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/encoding/bom-handling.html.ini b/tests/wpt/metadata-layout-2020/encoding/bom-handling.html.ini
new file mode 100644
index 00000000000..813b55eb6ec
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/encoding/bom-handling.html.ini
@@ -0,0 +1,4 @@
+[bom-handling.html]
+  [document.characterSet should match the BOM]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
new file mode 100644
index 00000000000..0d4e7c02632
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -0,0 +1,332 @@
+[response.window.html]
+  expected: TIMEOUT
+  [fetch(): combined response Content-Type: text/plain ]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/plain;charset=gbk text/plain;charset=windows-1252]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: */* text/html]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html;" \\" text/plain]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html */*]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: */* text/html]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html;" text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
+  [fetch(): separate response Content-Type: text/html;x=" text/plain]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/plain;charset=gbk;x=foo text/plain]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/plain;charset=gbk text/html]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/html */*]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type:  text/plain]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/plain;charset=gbk text/plain;charset=windows-1252]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [Response: combined response Content-Type: text/plain;charset=gbk text/html]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/html;x=" text/plain]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/plain;charset=gbk;x=foo text/plain]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html */*]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/html text/plain]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: */* text/html]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/plain;charset=gbk text/html]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/html */*;charset=gbk]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/plain ]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/plain;charset=gbk text/plain]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/html text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/plain */*]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/plain;charset=gbk text/plain]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type:  text/plain]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/plain;charset=gbk text/html]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html;" \\" text/plain ";charset=GBK]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/html;" text/plain]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html text/plain]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/plain ]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/html;" \\" text/plain]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/plain;charset=gbk text/plain;charset=windows-1252]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;x=" text/plain]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/plain */*]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: */* text/html]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/html */*;charset=gbk]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/plain;charset=gbk text/plain]
+    expected: FAIL
+
+  [Response: combined response Content-Type:  text/plain]
+    expected: TIMEOUT
+
+  [<iframe>: combined response Content-Type: text/plain;charset=gbk text/plain;charset=windows-1252]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/html */*]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;" \\" text/plain]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html */*;charset=gbk]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html;" text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/html;" " text/plain]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/plain;charset=gbk;x=foo text/plain]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html;" " text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
+    expected: FAIL
+
+  [Response: combined response Content-Type: text/html;x=" text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/html;x=",text/plain]
+    expected: FAIL
+
+  [fetch(): separate response Content-Type: text/plain;charset=gbk text/plain]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type:  text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/plain ]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html text/plain]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type:  text/plain]
+    expected: FAIL
+
+  [Response: combined response Content-Type: */* text/html]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html;" " text/plain]
+    expected: FAIL
+
+  [fetch(): separate response Content-Type: text/plain */*;charset=gbk]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html text/plain]
+    expected: FAIL
+
+  [Response: combined response Content-Type: text/html;" \\" text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/plain;charset=gbk;x=foo text/plain]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/plain;charset=gbk text/html]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html;charset=gbk text/html;x=",text/plain]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [Response: combined response Content-Type: text/html;charset=gbk text/html;x=",text/plain]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type:  text/plain]
+    expected: FAIL
+
+  [fetch(): separate response Content-Type: text/plain */*]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/plain;charset=gbk;x=foo text/plain]
+    expected: FAIL
+
+  [Request: combined response Content-Type: text/plain ]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html */*;charset=gbk]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;" " text/plain]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/plain */*]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/plain */*;charset=gbk]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html;charset=gbk text/html;x=",text/plain]
+    expected: FAIL
+
+  [fetch(): separate response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/plain */*;charset=gbk]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/plain;charset=gbk;x=foo text/plain]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/plain;charset=gbk text/plain;charset=windows-1252]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/plain;charset=gbk text/plain]
+    expected: NOTRUN
+
+  [<iframe>: combined response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [fetch(): separate response Content-Type: text/html text/plain]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;" text/plain]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain ";charset=GBK]
+    expected: FAIL
+
+  [fetch(): combined response Content-Type: text/html;" " text/plain]
+    expected: NOTRUN
+
+  [fetch(): separate response Content-Type: text/html;" " text/plain]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/plain;charset=gbk text/plain;charset=windows-1252]
+    expected: FAIL
+
+  [Response: combined response Content-Type: text/plain */*;charset=gbk]
+    expected: NOTRUN
+
+  [Request: combined response Content-Type: text/html;charset=gbk text/html;x=",text/plain]
+    expected: NOTRUN
+
+  [fetch(): combined response Content-Type: text/html;charset=gbk text/html;x=",text/plain]
+    expected: NOTRUN
+
+  [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
+    expected: NOTRUN
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
new file mode 100644
index 00000000000..c2400c3510e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -0,0 +1,64 @@
+[script.window.html]
+  [separate text/javascript;charset=windows-1252 x/x text/javascript]
+    expected: FAIL
+
+  [combined text/javascript;" x/x]
+    expected: FAIL
+
+  [combined x/x;charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [combined text/javascript;charset=windows-1252;" \\" x/x]
+    expected: FAIL
+
+  [separate x/x text/javascript]
+    expected: FAIL
+
+  [combined x/x;" x/y;\\" text/javascript;charset=windows-1252;" text/javascript]
+    expected: FAIL
+
+  [combined x/x text/javascript]
+    expected: FAIL
+
+  [separate text/javascript x/x]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252;" \\" x/x]
+    expected: FAIL
+
+  [combined text/javascript error]
+    expected: FAIL
+
+  [combined text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
+  [combined text/javascript;charset=windows-1252  text/javascript]
+    expected: FAIL
+
+  [separate x/x;charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [separate text/javascript; charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [combined text/javascript;charset=windows-1252 x/x text/javascript]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252  text/javascript]
+    expected: FAIL
+
+  [separate x/x;" x/y;\\" text/javascript;charset=windows-1252;" text/javascript]
+    expected: FAIL
+
+  [separate text/javascript;";charset=windows-1252]
+    expected: FAIL
+
+  [combined text/javascript; charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [separate text/javascript;" x/x]
+    expected: FAIL
+
+  [combined text/javascript ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
new file mode 100644
index 00000000000..f11fe97fb8b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -0,0 +1,16 @@
+[parsing-nosniff.window.html]
+  [X-Content-Type-Options%3A%20nosniff%0B%2Cnosniff]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20%22nosniFF%22]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20nosniff%0B]
+    expected: FAIL
+
+  [X-Content-Type-Options%3A%20nosniff%0C]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index 385376c7321..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
new file mode 100644
index 00000000000..9e2ec4357fe
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -0,0 +1,20 @@
+[supported-elements.html]
+  expected: TIMEOUT
+  [Contenteditable element should support autofocus]
+    expected: FAIL
+
+  [Host element with delegatesFocus including no focusable descendants should be skipped]
+    expected: NOTRUN
+
+  [Element with tabindex should support autofocus]
+    expected: TIMEOUT
+
+  [Non-HTMLElement should not support autofocus]
+    expected: NOTRUN
+
+  [Area element should support autofocus]
+    expected: NOTRUN
+
+  [Host element with delegatesFocus should support autofocus]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/touch-events/idlharness.window.js.ini b/tests/wpt/metadata-layout-2020/touch-events/idlharness.window.js.ini
new file mode 100644
index 00000000000..4c9b228d1b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/touch-events/idlharness.window.js.ini
@@ -0,0 +1,190 @@
+[idlharness.window.html]
+  [Document interface: document must inherit property "ontouchcancel" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document.body must inherit property "ontouchend" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: window must inherit property "ontouchend" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "touches" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "shiftKey" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface object length]
+    expected: FAIL
+
+  [TouchEvent must be primary interface of new TouchEvent("name")]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document.body must inherit property "ontouchmove" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute ontouchend]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "altitudeAngle" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document must inherit property "ontouchmove" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: window must inherit property "ontouchmove" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "rotationAngle" with the proper type]
+    expected: FAIL
+
+  [Touch interface: attribute azimuthAngle]
+    expected: FAIL
+
+  [Touch must be primary interface of new Touch({identifier: 1, target: document})]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document must inherit property "ontouchstart" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute ontouchcancel]
+    expected: FAIL
+
+  [HTMLElement interface: attribute ontouchend]
+    expected: FAIL
+
+  [Document interface: document must inherit property "ontouchend" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "targetTouches" with the proper type]
+    expected: FAIL
+
+  [Touch interface object length]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "force" with the proper type]
+    expected: FAIL
+
+  [Touch interface: attribute force]
+    expected: FAIL
+
+  [Stringification of new TouchEvent("name")]
+    expected: FAIL
+
+  [Touch interface: attribute touchType]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "pageY" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "metaKey" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document.body must inherit property "ontouchstart" with the proper type]
+    expected: FAIL
+
+  [HTMLElement interface: attribute ontouchstart]
+    expected: FAIL
+
+  [Window interface: attribute ontouchmove]
+    expected: FAIL
+
+  [HTMLElement interface: attribute ontouchmove]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "touchType" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: window must inherit property "ontouchstart" with the proper type]
+    expected: FAIL
+
+  [Document interface: attribute ontouchend]
+    expected: FAIL
+
+  [Touch interface: attribute rotationAngle]
+    expected: FAIL
+
+  [Document interface: document must inherit property "ontouchstart" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "screenX" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "altKey" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "screenY" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "radiusX" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "clientX" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "clientY" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "identifier" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "target" with the proper type]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "changedTouches" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document.body must inherit property "ontouchcancel" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute ontouchstart]
+    expected: FAIL
+
+  [TouchEvent interface: new TouchEvent("name") must inherit property "ctrlKey" with the proper type]
+    expected: FAIL
+
+  [Touch interface: attribute altitudeAngle]
+    expected: FAIL
+
+  [Document interface: attribute ontouchcancel]
+    expected: FAIL
+
+  [Document interface: attribute ontouchstart]
+    expected: FAIL
+
+  [Document interface: document must inherit property "ontouchmove" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "pageX" with the proper type]
+    expected: FAIL
+
+  [Stringification of new Touch({identifier: 1, target: document})]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document must inherit property "ontouchend" with the proper type]
+    expected: FAIL
+
+  [Document interface: attribute ontouchmove]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: document must inherit property "ontouchcancel" with the proper type]
+    expected: FAIL
+
+  [HTMLElement interface: attribute ontouchcancel]
+    expected: FAIL
+
+  [Touch interface: attribute radiusX]
+    expected: FAIL
+
+  [Touch interface: attribute radiusY]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "radiusY" with the proper type]
+    expected: FAIL
+
+  [Touch interface: new Touch({identifier: 1, target: document}) must inherit property "azimuthAngle" with the proper type]
+    expected: FAIL
+
+  [GlobalEventHandlers interface: window must inherit property "ontouchcancel" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
new file mode 100644
index 00000000000..5c7994f5bae
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -0,0 +1,10 @@
+[audiobuffersource-multi-channels.html]
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed.]
+    expected: FAIL
+
+  [< [test\] 1 out of 6 assertions were failed.]
+    expected: FAIL
+
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44057 more errors.\n\tMax AbsError of 1.9900983572006226e+0 at index of 12357.\n\t[12357\]\t-9.9751412868499756e-1\t9.9258422851562500e-1\t1.9900983572006226e+0\t2.0049667323212912e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
new file mode 100644
index 00000000000..1c434e642b3
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -0,0 +1,13 @@
+[sub-sample-buffer-stitching.html]
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed.]
+    expected: FAIL
+
+  [X SNR (-156.86292147944403 dB) is not greater than or equal to 85.58. Got -156.86292147944403.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t1.0347855872000000e+10\t5.6332010030746460e-1\t1.0347855871436680e+10\t1.8369406427693130e+10\t9.0957000000000003e-5\n\t[31081\]\t4.5671119549274438e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 1.0347855871436680e+10 at index of 31080.\n\tMax RelError of 1.8369406427693130e+10 at index of 31080.\n]
+    expected: FAIL
+
+  [< [buffer-stitching-1\] 2 out of 3 assertions were failed.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata-layout-2020/workers/semantics/multiple-workers/005.html.ini
new file mode 100644
index 00000000000..f584fce5df1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/semantics/multiple-workers/005.html.ini
@@ -0,0 +1,5 @@
+[005.html]
+  expected: ERROR
+  [dedicated worker in shared worker in dedicated worker]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
new file mode 100644
index 00000000000..6d92f8835c6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/shared-worker-in-data-url-context.window.js.ini
@@ -0,0 +1,8 @@
+[shared-worker-in-data-url-context.window.html]
+  expected: TIMEOUT
+  [Create a shared worker in a data url frame]
+    expected: TIMEOUT
+
+  [Create a data url shared worker in a data url frame]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 867578b2552..56a0abafb4c 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -160918,6 +160918,84 @@
        {}
       ]
      ],
+     "intrinsic-percent-replaced-dynamic-001.html": [
+      "1128ffa1759f26011c0639d8b5f498322c6396ac",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-dynamic-002.html": [
+      "f062b8a94cffae20d39ae7f0c2e5db9a0c061d9b",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-dynamic-003.html": [
+      "ef8832a405bf1bb73a5e95e3078bd20fac9febcb",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-dynamic-004.html": [
+      "b0c452b15129bb0cd4f63102d3b190d8db845a38",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-dynamic-005.html": [
+      "87a7a9b93b3a8ee8aa9806858c35e257dbc7dff0",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "intrinsic-percent-replaced-dynamic-006.html": [
+      "8ccd3a0bed064233c3aed6b3a6a948bfe1c47e9e",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "ortho-writing-mode-001.html": [
       "9342802645faa7b57a12ce4b8ef17d755fcaface",
       [
@@ -201125,6 +201203,19 @@
        {}
       ]
      ],
+     "backdrop-filter-root-element.html": [
+      "890e6ae51a8c4f65d357a90041f54666e9f447a4",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/backdrop-filter-root-element-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "backdrop-filter-update.html": [
       "de629a1fb2f85b1be4e2c4dd8bf53200b5295dc0",
       [
@@ -231159,6 +231250,19 @@
         {}
        ]
       ],
+      "foreign-object-with-position-under-clip-path.html": [
+       "a6d34bfff12bb1c8c238557d63850aa8883fe7b2",
+       [
+        null,
+        [
+         [
+          "/svg/extensibility/foreignObject/foreign-object-size-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "masked.html": [
        "ad18e8931aa9bbbac967b4d0ae694d68e92dbbb2",
        [
@@ -304936,6 +305040,10 @@
       "347b7a684cac002562314b8e8af57fb919667bec",
       []
      ],
+     "backdrop-filter-root-element-ref.html": [
+      "c92741df4300e5416cbe26339d52b819ec35347c",
+      []
+     ],
      "backdrop-filter-update-ref.html": [
       "ec4d80628b83c1e8e42cb389701dd7809b85ce6d",
       []
@@ -310963,7 +311071,7 @@
       []
      ],
      "delete.js": [
-      "e5ca838f6479b894258986557ade227ac0548845",
+      "db53a3643f600da683a1df2f49e6e55d5b1e6d3d",
       []
      ],
      "fontname.js": [
@@ -310983,7 +311091,7 @@
       []
      ],
      "forwarddelete.js": [
-      "bbc2b11a3cab72025395eea3f45b91a92a096a7a",
+      "2b8829e6721b521b19af3c71740dd5b73c84fd36",
       []
      ],
      "hilitecolor.js": [
@@ -311183,6 +311291,10 @@
      "a219a492f0b963f19c50c094e9f00cf3cb69d467",
      []
     ],
+    "bom-handling.html.headers": [
+     "2340a89c93ce4515026a5462cb9382dc2501bfdb",
+     []
+    ],
     "eof-shift_jis-ref.html": [
      "b90f8032a31db260902c2c04b671b30ee9c62c8e",
      []
@@ -325814,7 +325926,7 @@
      []
     ],
     "mediasession.idl": [
-     "8671af5acd9205978e1828502245ba134258c1e9",
+     "059d1ec8cf14c80fb78285b5014bd3a3e8c7e664",
      []
     ],
     "mediastream-recording.idl": [
@@ -326228,6 +326340,10 @@
       "cd600254805570deab8447ea843657d7f268b7c5",
       []
      ],
+     "invisible-images.js": [
+      "fd13e9454deda3c69228aab096ce032e8e1b7cff",
+      []
+     ],
      "largest-contentful-paint-helpers.js": [
       "0529e227b8094656361a7ab9d5ae81a92f0e8934",
       []
@@ -341199,11 +341315,11 @@
         []
        ],
        "firefox.py": [
-        "e195fc0cff4aed40fa298e4f01e19a0caa5ce1ac",
+        "3fbfbfaac81371c774cbb1ac8e96de27fa3c854b",
         []
        ],
        "firefox_android.py": [
-        "50f8504f8e022afbbf91c44399441283cdf8ec3f",
+        "a6cb8f0dd3e0f669d47b4a9a4a728d99fc648988",
         []
        ],
        "ie.py": [
@@ -341548,7 +341664,7 @@
        []
       ],
       "wptcommandline.py": [
-       "8125700b4bf568fef7065d50b834aa763e22b0ad",
+       "93bd886aac1e2574ab239ec615a2d866a0510ae4",
        []
       ],
       "wptlogging.py": [
@@ -379396,7 +379512,7 @@
       ]
      ],
      "env-in-custom-properties.tentative.html": [
-      "ea471b001f23d654aad2711c2f9351e69bd03fcc",
+      "6dadcc586b039b7fe4d69dc6ce4678a601343b77",
       [
        null,
        {}
@@ -396462,7 +396578,7 @@
       ]
      ],
      "variable-substitution-variable-declaration.html": [
-      "0b0ab1f0f0f868fa86673f51d6ada27245926add",
+      "678d05a1acc234362c1f8ac54f6a2190fc3a9fb1",
       [
        null,
        {}
@@ -396510,6 +396626,13 @@
        {}
       ]
      ],
+     "variables-substitute-guaranteed-invalid.html": [
+      "c30e8746db516f2ef35e904c948801b184ceecae",
+      [
+       null,
+       {}
+      ]
+     ],
      "vars-border-shorthand-serialize.html": [
       "07b78e58503ea42ffab1270a668fea08a9e7f8fd",
       [
@@ -405285,6 +405408,13 @@
       {}
      ]
     ],
+    "bom-handling.html": [
+     "ea70d362546ed0d75129ffa1aed67493cf5ae89e",
+     [
+      null,
+      {}
+     ]
+    ],
     "encodeInto.any.js": [
      "7e18c812499a52b14dacb772bfaf6c429ebc2da6",
      [
@@ -443112,15 +443242,22 @@
       {}
      ]
     ],
-    "invisible-images-composited.html": [
-     "f652180d4641d00beeb52fea67b13bf50f69e061",
+    "invisible-images-composited-1.html": [
+     "495645ab41eccb80464a2ceb7de83a2136ecfbf7",
+     [
+      null,
+      {}
+     ]
+    ],
+    "invisible-images-composited-2.html": [
+     "8ab32ebb1f24f653199406990d443094ae5b79fc",
      [
       null,
       {}
      ]
     ],
     "invisible-images.html": [
-     "49324663f22688c36dbf0ae1f131bda5339151f1",
+     "997d70f7773634fbb84bbaec334ecbdcdc4f9f2d",
      [
       null,
       {}
@@ -444188,7 +444325,7 @@
        ]
       ],
       "tabindex-001.html": [
-       "5dd040badc696c035dbbaafd90f40dcdecbca2d3",
+       "2352c629f5d56254252a189f16f9063f6f45a0d1",
        [
         null,
         {}
@@ -445655,7 +445792,7 @@
      "sharedworker-classic-data.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "df4b47add2b988e1837dc712a546662b777ea9d2",
+        "040c611834e1a9b721de3d0b2420a8bc58fdefcc",
         [
          null,
          {
@@ -445664,7 +445801,7 @@
         ]
        ],
        "websocket.https.html": [
-        "c551999a35aacf8c20e983be831fdc05deafb3ce",
+        "3103c00962f4c7632d585be2458899af3a876983",
         [
          null,
          {
@@ -445673,7 +445810,7 @@
         ]
        ],
        "xhr.https.html": [
-        "5c437feab5fa8b27de23ab7476d8a113fcf52182",
+        "d5c5d86fec9fc143a4b03eeaf3162cab477a138f",
         [
          null,
          {
@@ -445686,7 +445823,7 @@
      "sharedworker-classic-data.meta": {
       "opt-in": {
        "fetch.https.html": [
-        "4dae0e9fa4db5772e7003e0ddd7adb0c97e5f40c",
+        "e9953505ea09033693ab67bb8f4d5ba55b88dba2",
         [
          null,
          {
@@ -445695,7 +445832,7 @@
         ]
        ],
        "websocket.https.html": [
-        "b5f22ac32cc7e705ff2ae5419047c2df8d3a5437",
+        "cf0d0afaf0937c3eae76977a9d997a01f8d5d4fd",
         [
          null,
          {
@@ -445704,7 +445841,7 @@
         ]
        ],
        "xhr.https.html": [
-        "028bdaace3e984474ca5a16d14aea5ceef71714f",
+        "930816e391080713177a558d4f182beea6058c56",
         [
          null,
          {
@@ -445715,7 +445852,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "d8b6f13b919a8fecf0c59a61e022c22ec4ee29e6",
+        "7c3009e4b9ca9d77cfdd543962a632cc6738bf28",
         [
          null,
          {
@@ -445724,7 +445861,7 @@
         ]
        ],
        "websocket.https.html": [
-        "c551999a35aacf8c20e983be831fdc05deafb3ce",
+        "3103c00962f4c7632d585be2458899af3a876983",
         [
          null,
          {
@@ -445733,7 +445870,7 @@
         ]
        ],
        "xhr.https.html": [
-        "9682f5b78a1454a5cb48afa15e376430ce9216a8",
+        "d67d3dfbc1b15c436a72b8c979a1e8e895d7907e",
         [
          null,
          {
@@ -445746,7 +445883,7 @@
      "sharedworker-classic.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "52a9fe92ec3c53e1a600d9bf07251008c10a9a37",
+        "31550a1378bbcdb4c02e9ae4aba437f5d13f2f53",
         [
          null,
          {
@@ -445755,7 +445892,7 @@
         ]
        ],
        "websocket.https.html": [
-        "82e9516d076066441f1ecb4221cb83beac8801ed",
+        "e259b1dccec49dccd439444714f0d865a983b9d6",
         [
          null,
          {
@@ -445764,7 +445901,7 @@
         ]
        ],
        "xhr.https.html": [
-        "44f3573509a19bae398d8c50b54b48d0e44ca023",
+        "d14a58c11897e90128f4df754453622deddd7cf8",
         [
          null,
          {
@@ -445775,7 +445912,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "021a07c3dad5ea4b242e69e0e34e6e12ed8f47e7",
+        "41a7a328d7ba24c81841ae6361033e5a0af471be",
         [
          null,
          {
@@ -445784,7 +445921,7 @@
         ]
        ],
        "websocket.https.html": [
-        "0dca9c615a75f1b60504cb58ed2a4de8f58b4859",
+        "825f9b105cd6d3d7182749b56be55bbec07a53d4",
         [
          null,
          {
@@ -445793,7 +445930,7 @@
         ]
        ],
        "xhr.https.html": [
-        "b7553720a1598d1111dadcf14119311f2eb3e237",
+        "f2590c6ecd15e879cdf89353fb0fc3fa8aec9605",
         [
          null,
          {
@@ -445806,7 +445943,7 @@
      "sharedworker-module-data.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "b0488bd5182ab473c8a60ac3d8799052f9686cea",
+        "928365fd34ab532230dc21180db82304b58dac18",
         [
          null,
          {
@@ -445815,7 +445952,7 @@
         ]
        ],
        "websocket.https.html": [
-        "8a2b8707056af6fc764824176977500126e4def8",
+        "d04a361ee8e4eb8e409531a22828969c96837c00",
         [
          null,
          {
@@ -445824,7 +445961,7 @@
         ]
        ],
        "xhr.https.html": [
-        "cebddabe62556b80e2c9156cb8f75dfe30a57202",
+        "6c5090f2c415ee975d68d74bfda859075bc1248d",
         [
          null,
          {
@@ -445837,7 +445974,7 @@
      "sharedworker-module-data.meta": {
       "opt-in": {
        "fetch.https.html": [
-        "c5288a9a5393b2015b5fbf68efa4f44ffd7de1a5",
+        "037f931626dac8b558dd93b1781ddc69db387017",
         [
          null,
          {
@@ -445846,7 +445983,7 @@
         ]
        ],
        "websocket.https.html": [
-        "24e56cd69a373cdc73a92cbc530f768965f49f5f",
+        "2fbfc48915f8573ede11debf91a46ecdae1c2a12",
         [
          null,
          {
@@ -445855,7 +445992,7 @@
         ]
        ],
        "xhr.https.html": [
-        "0ad1cb82158a7f36832f7f4a2e1f2cf4129296fd",
+        "853bc1270bcc2e75d16ac1fe4c30c6afa0f4c0b1",
         [
          null,
          {
@@ -445866,7 +446003,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "55a31cf937dc2928a8a7a05a9ed3ef7d69e4644e",
+        "14c3103fe5fcc6ae4d4cf7f786beafef89132327",
         [
          null,
          {
@@ -445875,7 +446012,7 @@
         ]
        ],
        "websocket.https.html": [
-        "8a2b8707056af6fc764824176977500126e4def8",
+        "d04a361ee8e4eb8e409531a22828969c96837c00",
         [
          null,
          {
@@ -445884,7 +446021,7 @@
         ]
        ],
        "xhr.https.html": [
-        "83a4689d70b7e8637a48394beb9019e52294b608",
+        "68e2a490cc6eda3bddb5cd75c7c45d579c179c0d",
         [
          null,
          {
@@ -445897,7 +446034,7 @@
      "sharedworker-module.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "47a0d5d7961d9953467a3519452b60adf108f563",
+        "2a13933ff99266a741e0c4575db5a6015a1bac27",
         [
          null,
          {
@@ -445906,7 +446043,7 @@
         ]
        ],
        "websocket.https.html": [
-        "172b68ac2aab61f50162470d8ede4eea98878e37",
+        "3486ab3889212aa058a668e57f6fbae29aceb6d9",
         [
          null,
          {
@@ -445915,7 +446052,7 @@
         ]
        ],
        "xhr.https.html": [
-        "49a8090c3ce25b2c4e37656d59e7c4354e0bc14f",
+        "bd9395bdbbcb5911656b3114951393838391a8e8",
         [
          null,
          {
@@ -445926,7 +446063,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "9654df0bf034176edf7b1dd9d389b7426dfb2605",
+        "8f31ab2d19a8478dd8a18534ff0c868941ccdccf",
         [
          null,
          {
@@ -445935,7 +446072,7 @@
         ]
        ],
        "websocket.https.html": [
-        "211107c37004dfdb6b5667db483aa63b4b7100de",
+        "5eb627c7cfb82c1902d81f4a8c70730064bd74ee",
         [
          null,
          {
@@ -445944,7 +446081,7 @@
         ]
        ],
        "xhr.https.html": [
-        "4905587b0f6d350c7d363106d3ef8ca50e0cd75b",
+        "2ebeed08a0a750712f9a1699e974fdb6d4918d32",
         [
          null,
          {
@@ -445957,7 +446094,7 @@
      "top.http-rp": {
       "opt-in": {
        "audio-tag.https.html": [
-        "d25c2ed666b3ddeaebfcd8fad2ac1f10be253da6",
+        "599f8eb9b5e020a052e567391601ae32907f5551",
         [
          null,
          {
@@ -445966,7 +446103,7 @@
         ]
        ],
        "beacon.https.html": [
-        "61c37b7a556320aa29714649eedee7c724917aa2",
+        "b09f6332ddde65a02d9ae5b22e79234900755eb0",
         [
          null,
          {
@@ -445975,7 +446112,7 @@
         ]
        ],
        "fetch.https.html": [
-        "3269f5f37398a126b6080476fb3f4143e30f75bf",
+        "508a9d2bd79d1d6832d56551320969204469c874",
         [
          null,
          {
@@ -445984,7 +446121,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "4f37489aab1dffd64aeee052b796ed9a64b145da",
+        "eda0043651c78613ec88b1cf032552d6996719d3",
         [
          null,
          {
@@ -445993,7 +446130,7 @@
         ]
        ],
        "link-css-tag.https.html": [
-        "7d1ec353f95a9f39ca819177586955f1127fd1c6",
+        "237ec0ca78233558ea50a4ba16a4d5d763e543f0",
         [
          null,
          {
@@ -446002,7 +446139,7 @@
         ]
        ],
        "link-prefetch-tag.https.html": [
-        "d4e4580fe379eecab66d10cb1d8ae03545459d9b",
+        "0efd1429a770511477cf9ad48ba6ff27fea4b32a",
         [
          null,
          {
@@ -446011,7 +446148,7 @@
         ]
        ],
        "object-tag.https.html": [
-        "9706dd21b77468b9c43037c5917163c3570a232d",
+        "6bc8f75f65247aeb67582f7dcf12524f308f222d",
         [
          null,
          {
@@ -446020,7 +446157,7 @@
         ]
        ],
        "picture-tag.https.html": [
-        "baaf0a857b70a6b8feba2501e34a8e165cf98fb7",
+        "088c6c410a219e1200964e489c7058dc57af897e",
         [
          null,
          {
@@ -446029,7 +446166,7 @@
         ]
        ],
        "script-tag.https.html": [
-        "1666599706518e56a960bccb322bd974e674b9e2",
+        "d806e9c0bc8761c99190e71d1b04107e5d838704",
         [
          null,
          {
@@ -446038,7 +446175,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "0beaaeeb1289292647b107010c820265e221b2db",
+        "896c0297d5f7d538afc0ddee6bf00b8710cf0b74",
         [
          null,
          {
@@ -446047,7 +446184,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "1da38318f41427a2d123ee6d656c2aea3a2a3022",
+        "2784b2bf13e4bbdd4787969cd75f2f1769e98350",
         [
          null,
          {
@@ -446056,7 +446193,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "75c8623fe104b1124410059fdb1052991b5689fe",
+        "1a371ce028f4612a3fcf308c67f461396d263e32",
         [
          null,
          {
@@ -446065,7 +446202,7 @@
         ]
        ],
        "video-tag.https.html": [
-        "c03abe0838547abb5f767d1cf417965c8f2c4092",
+        "ff176ab6d1f8c24ee2cc3f6d7921bef167c7cd08",
         [
          null,
          {
@@ -446074,7 +446211,7 @@
         ]
        ],
        "websocket.https.html": [
-        "1bacd28b99abe15921339477a2ac25176511df85",
+        "49b80c448f70bdda08a29b34d53ca1db433ae2ae",
         [
          null,
          {
@@ -446083,7 +446220,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "36aeee17649b726c2b21dd492a5bffb521a45df5",
+        "2717be37ccf81dba8176718096a49115775297f8",
         [
          null,
          {
@@ -446092,7 +446229,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "8a7cfb38dac8a12e05861db3e936a8aefb3dc0cb",
+        "a44eee04689d32ed69d4323facf167d8f8596331",
         [
          null,
          {
@@ -446101,7 +446238,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "9ac91e94e039c5e0d9bdd90de6956f0f876b6dda",
+        "6cf33d54f5fa7b3b8ea1b3a0936f21092724845f",
         [
          null,
          {
@@ -446110,7 +446247,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "e53a0cf22833d2afa9e2dd0af417e4933b8b4785",
+        "165cbf6d14d58ebe885bd3eeb733fddbb7d2288f",
         [
          null,
          {
@@ -446119,7 +446256,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "de8f9d1c4ee2d3580ae7f537e53da3f14422ae58",
+        "67926809f28ad139181a4d7ca051715cee61daf3",
         [
          null,
          {
@@ -446128,7 +446265,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "fd9287d6f3ea2a62f72d2f7507c825497721f57c",
+        "72ebea2ff2d6f28be1b45d4d0f43956719a80fe0",
         [
          null,
          {
@@ -446137,7 +446274,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "c3603607656fbac24845e412c45e89767531437f",
+        "3c31d0d99837bcb2d27b3df82cb8c8642544b050",
         [
          null,
          {
@@ -446146,7 +446283,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "476b70c1fee6e1af82a49439291a45a5b03967a0",
+        "ae84f3d1ef8206b7c2437477abe33428d9ade227",
         [
          null,
          {
@@ -446155,7 +446292,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "6aeb702b379cdee21ad34bd7983a580bf86dfa7e",
+        "8a39e2d9d3245ac4758c4ccba2f515a5f670be21",
         [
          null,
          {
@@ -446164,7 +446301,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "42644b34f4c77aa39c2b2692ca9a8334be611cab",
+        "918051440e2ffcc0c5e41642caa2a6ef8c40a749",
         [
          null,
          {
@@ -446173,7 +446310,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "b8e30a65ad66d437f3e672c07696ab273adb8c2e",
+        "c270a2b70ad1e0700d2d92fd4f3229c91d9967f8",
         [
          null,
          {
@@ -446182,7 +446319,7 @@
         ]
        ],
        "xhr.https.html": [
-        "93975e2d69211dba986d0b1070a31db636e65ba5",
+        "22f4aa06b5311dfc021ba672dcfcc1b382702b47",
         [
          null,
          {
@@ -446195,7 +446332,7 @@
      "top.meta": {
       "opt-in": {
        "audio-tag.https.html": [
-        "b4bf5f4f1e46675f3215e7902ed9ddf9d109918c",
+        "9734cef5c5434d0754d007a20b6f31f35506c706",
         [
          null,
          {
@@ -446204,7 +446341,7 @@
         ]
        ],
        "beacon.https.html": [
-        "45dec1af776f45a91c172b23c2e4c3fda2410cce",
+        "87442befd3f9016b44e1aab3fb271189bd2309b8",
         [
          null,
          {
@@ -446213,7 +446350,7 @@
         ]
        ],
        "fetch.https.html": [
-        "d7ae8c8532a946a2e99f39a7fa18e04a663aaff9",
+        "45378cae4a10b3a47e965f2db4048131e194e3dc",
         [
          null,
          {
@@ -446222,7 +446359,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "0e9ff596aa60275d9579ff4d93bb1ac51dd1d76a",
+        "8c2486d9a7258c3e2dccd80d9a61b6b744f54978",
         [
          null,
          {
@@ -446231,7 +446368,7 @@
         ]
        ],
        "link-css-tag.https.html": [
-        "73cf23ab72fded27c9b9046a7c8a32a5956b96dd",
+        "2014c10e230601e2f892ffa2d4b32e96eae46940",
         [
          null,
          {
@@ -446240,7 +446377,7 @@
         ]
        ],
        "link-prefetch-tag.https.html": [
-        "7fa4d088b05aa70009318b24d74527168d05fb2d",
+        "456139afdaac8677e0b941167d39543958510980",
         [
          null,
          {
@@ -446249,7 +446386,7 @@
         ]
        ],
        "object-tag.https.html": [
-        "215fcbc1bc05d990c7716ca6bf698719b8f74c2a",
+        "209927d53f1738efee9f7b7891bd9b1110897344",
         [
          null,
          {
@@ -446258,7 +446395,7 @@
         ]
        ],
        "picture-tag.https.html": [
-        "279c128fc8f9f559cd730a6fa267defe9340189f",
+        "d28777b8cb77b9cd37109ca7f99f91f63c9e9d4f",
         [
          null,
          {
@@ -446267,7 +446404,7 @@
         ]
        ],
        "script-tag.https.html": [
-        "436bb1cdfb76894284d9a762ed65a35f9c11b46c",
+        "55e2dadb0679f17bbbb95d90f9858aeefb19cafe",
         [
          null,
          {
@@ -446276,7 +446413,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "caa080b3a2f469e148b610af647fb97a51d7b8c2",
+        "02c50e3bcb6f0f3f7187a6afb33631d9f61dfce6",
         [
          null,
          {
@@ -446285,7 +446422,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "f1b8ce8a40c7976fd62b67bdf4d4d76b7191e0e5",
+        "d906686d9272d36d04225e74e9b75e01b2c576a3",
         [
          null,
          {
@@ -446294,7 +446431,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "82067e486205be916dcf684c0da949e21df017e0",
+        "2ebb23193145de53226aec24f0a34812693d6e14",
         [
          null,
          {
@@ -446303,7 +446440,7 @@
         ]
        ],
        "video-tag.https.html": [
-        "19ffe51d8377e900f88435ba79df021c79db2f3e",
+        "6b40dfc2e69e258fc2c8739eb52f825a7a3aa7ec",
         [
          null,
          {
@@ -446312,7 +446449,7 @@
         ]
        ],
        "websocket.https.html": [
-        "af2205993597c07a08e61f6a5c88e17a46666e15",
+        "b54656dbe74c31ffd01ff20c3fbad586039f44fa",
         [
          null,
          {
@@ -446321,7 +446458,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "2d374e6fef4744bfe2228c57aa679b6b09120eae",
+        "ca7667ceef3d49906897d887c3a746c51b2f551b",
         [
          null,
          {
@@ -446330,7 +446467,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "3b163fc29e73a5a03935df2138fa16cd58d3a769",
+        "2ff9aa7cf2a6de9d24ad6b53ace9befb30360878",
         [
          null,
          {
@@ -446339,7 +446476,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "4e1c26bf38a58765e2a75cd956a973ae375c3aff",
+        "2f1c240cae93a39b75cc9489e89c903171ab82e4",
         [
          null,
          {
@@ -446348,7 +446485,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "40909c4fdd86e0c70a5d8bf34482f1c3173c1849",
+        "0ebc71607faab1079eaa798cba6b96e5e2673873",
         [
          null,
          {
@@ -446357,7 +446494,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "337df6cee8b707f14be5cec9b6ff39dedfbfef67",
+        "b3b070b60bac292dfa07c1aae548973dba77e6e0",
         [
          null,
          {
@@ -446366,7 +446503,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "3496f7d64a11f41c8b35097a2a3303c26c671095",
+        "383e08f0d94c72877cd366b2fabaca06d13fb246",
         [
          null,
          {
@@ -446375,7 +446512,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "6a124225d36a44a85546f9cebe24e6a508e5afb6",
+        "c4caffa7c5e304aea402f6119ccf279ae153bd33",
         [
          null,
          {
@@ -446384,7 +446521,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "4ef290efd3795d8f3a7783135b11b921e7f8b753",
+        "b90abff51275ea730d406420695db0d7dd1bc28b",
         [
          null,
          {
@@ -446393,7 +446530,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "19dfe3e93b7a701e7dd64d54b97a37d601b02e7f",
+        "08f5bcc66edb0ba91d1fd84fdfc5ad75e69839f0",
         [
          null,
          {
@@ -446402,7 +446539,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "0883c6280bd148398ae7a8db9f69792091f8f7c0",
+        "04176e561d704a86a32a6ab3ce87f2282523987b",
         [
          null,
          {
@@ -446411,7 +446548,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "896ffc83cc0c5835ea15d94439c5adf36a55c3ec",
+        "8c58fc638f46fdaeb7f3d2f149b8ddc4c6b7fcfc",
         [
          null,
          {
@@ -446420,7 +446557,7 @@
         ]
        ],
        "xhr.https.html": [
-        "0a34b9035fb436190718a942f37be3fc35a4977a",
+        "22cbcd7ed0b4926ad6e59058eee444555a24ad1a",
         [
          null,
          {
@@ -446431,7 +446568,7 @@
       },
       "unset": {
        "audio-tag.https.html": [
-        "822561fe53e0b922c4e8b3d31484b52c93b5524e",
+        "75c9b7535572dfb0635bb2e2257874d9f81620e6",
         [
          null,
          {
@@ -446440,7 +446577,7 @@
         ]
        ],
        "beacon.https.html": [
-        "a08a18944cb219913b7d3b4ffb01680f4c377580",
+        "ae29a64f41fc7687f8643b37e999e2cfed8d38e0",
         [
          null,
          {
@@ -446449,7 +446586,7 @@
         ]
        ],
        "fetch.https.html": [
-        "034043c56ca2e808871ddd58263b13c2da98f87b",
+        "1250aec2a8d157e97f7810a56f6f79802063aac3",
         [
          null,
          {
@@ -446458,7 +446595,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "46039be2d38fff16c0513817e8a033fe2f9b5c61",
+        "c02bf8b69ce53ac2d30213292288077307b27083",
         [
          null,
          {
@@ -446467,7 +446604,7 @@
         ]
        ],
        "link-css-tag.https.html": [
-        "3e75c7884a4d10b2467403e16e3bd29fc2b66887",
+        "559e0223c04083579f54d238d9c0c182786fe2ca",
         [
          null,
          {
@@ -446476,7 +446613,7 @@
         ]
        ],
        "link-prefetch-tag.https.html": [
-        "57b81f21a048a368db30d916370ff7ef343a8e66",
+        "5a0364121e9f4c0336cb7296913a8d6ce5c55df8",
         [
          null,
          {
@@ -446485,7 +446622,7 @@
         ]
        ],
        "object-tag.https.html": [
-        "8f606cbda48165ee791d7b54f2aefe8e902da316",
+        "e22e783950b84c8846597b82d05304bd61cde64f",
         [
          null,
          {
@@ -446494,7 +446631,7 @@
         ]
        ],
        "picture-tag.https.html": [
-        "e6eaeec7fc7227de704fb0d64b64407a591ff303",
+        "432ab7eaa33dca4a6996e69a54afd360d8884bb3",
         [
          null,
          {
@@ -446503,7 +446640,7 @@
         ]
        ],
        "script-tag.https.html": [
-        "ff3d6b9e786b40d928dd0f7d33dbdc306ee9a4fa",
+        "3cd5eb3a34e93dc8119f0aa37db5e5889c85c92c",
         [
          null,
          {
@@ -446512,7 +446649,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "0beaaeeb1289292647b107010c820265e221b2db",
+        "896c0297d5f7d538afc0ddee6bf00b8710cf0b74",
         [
          null,
          {
@@ -446521,7 +446658,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "6ef7ff8ce7840bce9887468db01c4a3349c332e5",
+        "afc248529b097d5a49c1ee526b0c49c0cb4b579c",
         [
          null,
          {
@@ -446530,7 +446667,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "75c8623fe104b1124410059fdb1052991b5689fe",
+        "1a371ce028f4612a3fcf308c67f461396d263e32",
         [
          null,
          {
@@ -446539,7 +446676,7 @@
         ]
        ],
        "video-tag.https.html": [
-        "fef50b70adaf92b6b440a3df6a167da8ae5b4200",
+        "56c9a4cf5aa80867e6593e4ba299dcecd41caa08",
         [
          null,
          {
@@ -446548,7 +446685,7 @@
         ]
        ],
        "websocket.https.html": [
-        "1bacd28b99abe15921339477a2ac25176511df85",
+        "49b80c448f70bdda08a29b34d53ca1db433ae2ae",
         [
          null,
          {
@@ -446557,7 +446694,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "2e456cef1859b72646ebb7f89b601874254a2f46",
+        "2717be37ccf81dba8176718096a49115775297f8",
         [
          null,
          {
@@ -446566,7 +446703,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "3910434a3a87508dc84fb720bb4915fe837386f7",
+        "ae559b90e9a22d190233a04139e10c8b1e84b01b",
         [
          null,
          {
@@ -446575,7 +446712,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "49ba4d5f2059bbc8d97745d513d3e6da618b14da",
+        "6cf33d54f5fa7b3b8ea1b3a0936f21092724845f",
         [
          null,
          {
@@ -446584,7 +446721,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "b8ff50d3fb5acf3e3e219a708ac046f4afe58e5f",
+        "77fdf272d12b4bd83e15c4c9f4c50ff407878a5b",
         [
          null,
          {
@@ -446593,7 +446730,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "cc4f9f2399b605f509accfe08b29756ddad2555c",
+        "64d00ddd5b7208bf2adc4bdaf9141f46f7be5171",
         [
          null,
          {
@@ -446602,7 +446739,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "eb07e9216321d880af07f54f6855b6685ff17d95",
+        "faa0c457fa7d45b1181fc5dbde9fce8baa6d6c3f",
         [
          null,
          {
@@ -446611,7 +446748,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "1c0f12d8faa9da10be8c3fec4961b256dc7a587f",
+        "7151f534de3d30cb1068d1fd7b64b2e8fce795b8",
         [
          null,
          {
@@ -446620,7 +446757,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "c0a964c03b940e1458722f1ea6c29a7623416dc8",
+        "da7c9a797e9e10c0e2bb009eed08764010f5bea0",
         [
          null,
          {
@@ -446629,7 +446766,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "66248820afa0802c10a4ad2790e2934d13451b71",
+        "f2335d35ae75e2f8c3d04f0a3cfe6af9414dee5c",
         [
          null,
          {
@@ -446638,7 +446775,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "f0cdddf12631c738a31f26ef656590acf32d95a6",
+        "5c1970599d7bb7ea6f663c8e1a57d23e1d9b3877",
         [
          null,
          {
@@ -446647,7 +446784,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "83146d6247eeb52b4290a5dce828ced199ba255b",
+        "77cf29176c1a8fe904f240e0b68956c4bb901de2",
         [
          null,
          {
@@ -446656,7 +446793,7 @@
         ]
        ],
        "xhr.https.html": [
-        "728c685924fbaf5c784d04fac4bc1d67a8905bd9",
+        "0f164b4077eb6d14ac32bce7de4763ea088eef7d",
         [
          null,
          {
@@ -446669,7 +446806,7 @@
      "worker-classic-data.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "9cae4dbc1da8c83234d2e341760bc243264b7614",
+        "d2b13b27346c6b15cbad947eeadfefeba2d8e8f8",
         [
          null,
          {
@@ -446678,7 +446815,7 @@
         ]
        ],
        "websocket.https.html": [
-        "5433c76d9c65271584286bb150e0d5f378fb1390",
+        "01263c9ee6ab1f1f3a5aeae645c8b38813571773",
         [
          null,
          {
@@ -446687,7 +446824,7 @@
         ]
        ],
        "xhr.https.html": [
-        "bd5c73caf3cac4344ad4a1d580ef65cf14ee2193",
+        "71ee538072e48ee07419ce8d1633c9783f530827",
         [
          null,
          {
@@ -446700,7 +446837,7 @@
      "worker-classic-data.meta": {
       "opt-in": {
        "fetch.https.html": [
-        "d3591afb1b6ad5cc85dbed7f1717c8be97e27c4e",
+        "e8693e4fef85417e89658aa6319cc2d05f88467e",
         [
          null,
          {
@@ -446709,7 +446846,7 @@
         ]
        ],
        "websocket.https.html": [
-        "4917ad091edda8e833d1aab3346dd345ac82c847",
+        "af1d8362509fefae6664deb8d116034ad8af972a",
         [
          null,
          {
@@ -446718,7 +446855,7 @@
         ]
        ],
        "xhr.https.html": [
-        "ec92701607570e2005c4a93c29102e8f4b2e6441",
+        "e8a86f79e7eaf7df062b68c5dc73337a1d83ae25",
         [
          null,
          {
@@ -446729,7 +446866,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "952c9e9a1148e6521fc9cc8bc640f22d1ccd89b0",
+        "da5a674c5439c3834d008622cfbe617e67aa3a7a",
         [
          null,
          {
@@ -446738,7 +446875,7 @@
         ]
        ],
        "websocket.https.html": [
-        "5433c76d9c65271584286bb150e0d5f378fb1390",
+        "01263c9ee6ab1f1f3a5aeae645c8b38813571773",
         [
          null,
          {
@@ -446747,7 +446884,7 @@
         ]
        ],
        "xhr.https.html": [
-        "3bb7ec52173b97a0a45985e3519783e8fd157d39",
+        "431e05aa5044038ca41a0d79bfd52a43a1875e8b",
         [
          null,
          {
@@ -446760,7 +446897,7 @@
      "worker-classic-inherit.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "f0538f1a09c19a2c228b7a5ffdbb2a673c1abf1c",
+        "a89d066c9f7c74e753d829cd83935c01f8776693",
         [
          null,
          {
@@ -446769,7 +446906,7 @@
         ]
        ],
        "websocket.https.html": [
-        "c483e2a0655024b798c322c2cc2a6aba22569ca3",
+        "ebfb71e2f85fc81898b5d81dade9ab01dbfbd825",
         [
          null,
          {
@@ -446778,7 +446915,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "36ec2a61dad66ab776baf1b29fd825a01a40e12c",
+        "e5f825d5778bebff888b708d051ae00c9b58851a",
         [
          null,
          {
@@ -446787,7 +446924,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "05342727efec09561ac5b7d5dd5d9c3b3b34c727",
+        "f10998e3f007b8c8c283f816513683206eb94f23",
         [
          null,
          {
@@ -446796,7 +446933,7 @@
         ]
        ],
        "xhr.https.html": [
-        "031458808b44720539e9f9a0511c6cfac1e5f897",
+        "863aa62d05e0cf3f3ad07d86385bae0abd368e2b",
         [
          null,
          {
@@ -446809,7 +446946,7 @@
      "worker-classic-inherit.meta": {
       "opt-in": {
        "fetch.https.html": [
-        "4f579fd3f9b2b51adf1cd375b00e8ade601edf65",
+        "2dfd32d0ed9289b7fd427b2835dfd4d194349e72",
         [
          null,
          {
@@ -446818,7 +446955,7 @@
         ]
        ],
        "websocket.https.html": [
-        "3e794b3136bc5ce145c4a578fd3610b1989d4a4d",
+        "76ba980671041d30de9306eddc2b4a8983393b4a",
         [
          null,
          {
@@ -446827,7 +446964,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "95d529e0e4e461a2de160275964f846ca63a03e0",
+        "0de01f79b8b71c810972d6c112c3b4965a0ec441",
         [
          null,
          {
@@ -446836,7 +446973,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "5783e636ad0a397b77249af6a71d684300fac97b",
+        "32f4762c4381c3531e7ab6f86bd9a060193c4ace",
         [
          null,
          {
@@ -446845,7 +446982,7 @@
         ]
        ],
        "xhr.https.html": [
-        "888597dafc32ebf7bc4e9eff915f98aff60dc434",
+        "dd7305e4233600b99432d01cc9d19799eb2fbd47",
         [
          null,
          {
@@ -446856,7 +446993,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "d8b742c574ac8c15d03845d72d6ad062acb36972",
+        "713df3085ffed1c4bfe47ae52cd21d1a97e18e89",
         [
          null,
          {
@@ -446865,7 +447002,7 @@
         ]
        ],
        "websocket.https.html": [
-        "486b9c95f606dbc5aae7f6da4b07f18ace129a85",
+        "4357a44457017bf1169df402d18f2a1b8fccc9b6",
         [
          null,
          {
@@ -446874,7 +447011,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "bd78a5b6efd83885ff490a525855922ad120d6b9",
+        "5dde9baae5b2299cd4d441f173289bbb3fe0bf43",
         [
          null,
          {
@@ -446883,7 +447020,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "9e54a72a143b8c54272ffede2024127075c878c8",
+        "6672e464a3fd6a613d916e06834b4feefd13a837",
         [
          null,
          {
@@ -446892,7 +447029,7 @@
         ]
        ],
        "xhr.https.html": [
-        "fc51681a647646530230ac9faa0c77f075e6f4e1",
+        "c6e0211aded767dcb098c920171c51a852f2643a",
         [
          null,
          {
@@ -446905,7 +447042,7 @@
      "worker-module-data.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "2860fcaec57b69f270ab2b0a5837343a25996662",
+        "90cfde361815f85a6f5d1f00682a1aeb5b6e4bc0",
         [
          null,
          {
@@ -446914,7 +447051,7 @@
         ]
        ],
        "websocket.https.html": [
-        "498935b0f0608b465c85756959efaf2423f0982e",
+        "a202f1af21ade7d61420884cb2a0bcae777734f1",
         [
          null,
          {
@@ -446923,7 +447060,7 @@
         ]
        ],
        "xhr.https.html": [
-        "8a1163d1f0550490f64a821333e67daf0df43798",
+        "1e26f150a641bd701c7d47165442cab6e8905941",
         [
          null,
          {
@@ -446936,7 +447073,7 @@
      "worker-module-data.meta": {
       "opt-in": {
        "fetch.https.html": [
-        "74f36e42d2fca127d715f2d9dca248355023676d",
+        "8ed388b1e7a0ab23ced3bd53a46d99bb6f06fe89",
         [
          null,
          {
@@ -446945,7 +447082,7 @@
         ]
        ],
        "websocket.https.html": [
-        "248bb61badf6945fd99470868aec7e9f6cb2f9a7",
+        "ba6c014439674b3c6b52f1728df17c5b2c36e1ba",
         [
          null,
          {
@@ -446954,7 +447091,7 @@
         ]
        ],
        "xhr.https.html": [
-        "056e48a8e570c0210cd88158b3421d491ac38865",
+        "808e6b6f5a4114f96e797ac0d2f56ab6b887450c",
         [
          null,
          {
@@ -446965,7 +447102,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "6d7ceaaa12fe841b0c4773eeb0ed42d10d78e0ac",
+        "1a04af86788ead7251d722ca1a6126a0314c0b8d",
         [
          null,
          {
@@ -446974,7 +447111,7 @@
         ]
        ],
        "websocket.https.html": [
-        "498935b0f0608b465c85756959efaf2423f0982e",
+        "a202f1af21ade7d61420884cb2a0bcae777734f1",
         [
          null,
          {
@@ -446983,7 +447120,7 @@
         ]
        ],
        "xhr.https.html": [
-        "a2b5d178024ef11bae2d225c49845171b48ee722",
+        "da80502084526054129b2da6e3b385bb75cd4ff9",
         [
          null,
          {
@@ -446996,7 +447133,7 @@
      "worker-module-inherit.http-rp": {
       "opt-in": {
        "fetch.https.html": [
-        "9c8378953da5f13b742713ff0fb9b1b042f2b905",
+        "8eec2b41490710e4ec8f637bf9b874257efb7a10",
         [
          null,
          {
@@ -447005,7 +447142,7 @@
         ]
        ],
        "websocket.https.html": [
-        "2a6db7c11889db343c64f56aaaeb6bdaaad6e737",
+        "220c21c4111d5cf5514ca49f8353cc896d3e26cc",
         [
          null,
          {
@@ -447014,7 +447151,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "d9e46d2a25f7d98c7e69d4cb6918df1972a65d91",
+        "9619ce4cd75a302eb850282814f4c9c3505254d3",
         [
          null,
          {
@@ -447023,7 +447160,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "cc438d8f8aa10165be1211ceee3dd7598ff6d0f5",
+        "d6e28445e09dd5b07eec964099907ec8ef80800f",
         [
          null,
          {
@@ -447032,7 +447169,7 @@
         ]
        ],
        "xhr.https.html": [
-        "ed371b7c15758978b735b11c11bff5b47ff74e6b",
+        "69aa3499ce256a919389989fb845caf012fdfab0",
         [
          null,
          {
@@ -447045,7 +447182,7 @@
      "worker-module-inherit.meta": {
       "opt-in": {
        "fetch.https.html": [
-        "5660bf59137c3e7c6eadaa2c10c1d0122b6ed5fa",
+        "f6fc93a6b8fc2db24d27c881396de57a21cc11a0",
         [
          null,
          {
@@ -447054,7 +447191,7 @@
         ]
        ],
        "websocket.https.html": [
-        "f6563925c4fcd2eae54d5a44170e52cf7b62f249",
+        "cbfc485b1527deee2a28684563373c2d67ec7a43",
         [
          null,
          {
@@ -447063,7 +447200,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "fae263e9af40c26003eaf4e5e343767930c1b2aa",
+        "01512ff49bc89b6c5610835e796cc30b5163c3ee",
         [
          null,
          {
@@ -447072,7 +447209,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "6a0d14b4a48258ac0185abea92c7b077ec937dc5",
+        "89fe1d60fbe084e6fa03a42be0ddc2479913b209",
         [
          null,
          {
@@ -447081,7 +447218,7 @@
         ]
        ],
        "xhr.https.html": [
-        "f960502457d6b620609b4bac3ede0de98d8af098",
+        "3425ccfb552b3cc463e8d429195476e7e5ba9e6b",
         [
          null,
          {
@@ -447092,7 +447229,7 @@
       },
       "unset": {
        "fetch.https.html": [
-        "91305554a24afc0fdfe466dc2c08f75e97f8aed4",
+        "383f923317b25cb57f04fae7b12549efa48cb666",
         [
          null,
          {
@@ -447101,7 +447238,7 @@
         ]
        ],
        "websocket.https.html": [
-        "d9565d0ecdcd56b49d585328c0e6ff258ca116e0",
+        "0e7c357ae22c0b28795b239d1ef17ca0b4d69969",
         [
          null,
          {
@@ -447110,7 +447247,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "86885c1082fc2a8aabe1f89c666c2cf87eeeee37",
+        "e8eba008f9f3c3ef1da32ac9e7c660ed31e8489a",
         [
          null,
          {
@@ -447119,7 +447256,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "b69bda02dead072bba1f847897836b5123dd042c",
+        "f4348836ad44b7a424e7e58a7889b42d82d30a43",
         [
          null,
          {
@@ -447128,7 +447265,7 @@
         ]
        ],
        "xhr.https.html": [
-        "54a64915a6a7b0fcc24783f9df9cd0562b527964",
+        "93c5b002edc4510b52c256c1d56ead47f8e00611",
         [
          null,
          {
@@ -462097,6 +462234,24 @@
       }
      ]
     ],
+    "pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html": [
+     "f03f98abe06ba2d45ea9fbff829437d9f7f2e671",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "pointerevent_lostpointercapture_for_disconnected_shadow_host.html": [
+     "4b5c9f6eae84af2ca0902f34964bde3c8c1fcb5b",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_lostpointercapture_is_first.html": [
      "6ce0f3e59a04db4ecf23d9fd60b57164ceb67f85",
      [
@@ -462131,6 +462286,24 @@
       }
      ]
     ],
+    "pointerevent_pointercapture-in-custom-element.html": [
+     "e8f143b309f2dbdda19c90e1aef1865ecf889f47",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "pointerevent_pointercapture-in-shadow-dom.html": [
+     "8279665f97b0ee522b9bd5710d5ec5ad677df85a",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_pointercapture-not-lost-in-chorded-buttons.html": [
      "02a6af0a4b89abf1c0c51844ace15b54e91966e9",
      [
@@ -463578,7 +463751,7 @@
          ]
         ],
         "fetch.http.html": [
-         "305db3d51ff90e61983fc3e87126320d4e7461d6",
+         "f766c2d37f9ad29474272307d0d768526f0f660c",
          [
           null,
           {
@@ -463587,7 +463760,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "7daee4808c413286e91b2eb2f7ba78d6803a948b",
+         "213d16bf07c5ab6b13e439d490ce63435ae583c6",
          [
           null,
           {
@@ -463596,7 +463769,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "47ef89c00a99b312beac2ed2710d8295416aa8db",
+         "2b3587e828bc2f091c5b4dc899483c06aae316f5",
          [
           null,
           {
@@ -463605,7 +463778,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "0d99b76db33ddaba0f4ea5a3cb8f60e6427e8af4",
+         "888ef8183d852d0bc3a6ee63da992dd797b79df5",
          [
           null,
           {
@@ -463641,7 +463814,7 @@
          ]
         ],
         "xhr.http.html": [
-         "9be2500bbf06c75c63fca3233bb4a108cbb821aa",
+         "6b1681106a2a7cedbf7d965578d4ef794f26cbfb",
          [
           null,
           {
@@ -463661,7 +463834,7 @@
          ]
         ],
         "fetch.http.html": [
-         "487709f01e98d3ec5354996bc92abef5680804af",
+         "f382044bad94790082eb65f8f3e75b7b9f81a213",
          [
           null,
           {
@@ -463670,7 +463843,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "d7d412fb02d3850ddd490609c1105485367775cb",
+         "45a6cbc98b0894e35dd71d59794139ea5e325204",
          [
           null,
           {
@@ -463679,7 +463852,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "cfe20a86dd191a5dd79fb44e9706b557cb49c6c8",
+         "00f7e69b577d8192cca5f4530aeb5fa1d06c4757",
          [
           null,
           {
@@ -463688,7 +463861,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "56a6cb4afcce7fc1a2f03ad9dfd43402e699c735",
+         "c498ec68feb24ebddb7aa9f7dcf17e6cb5a15733",
          [
           null,
           {
@@ -463697,7 +463870,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "682959ab4e4375a35c1a44e1cabc8f20318f52d1",
+         "79dee1335877fd54ec8b4930d42e5c1a1649b8a6",
          [
           null,
           {
@@ -463706,7 +463879,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a3b4f54713b7c7d3efb4fae5a6b2a45682f90d66",
+         "ed4c29375ea77277e629016a10dfd6ba597fed33",
          [
           null,
           {
@@ -463715,7 +463888,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "e3e564ea5d6c35b409eace382cbe8f76146830fd",
+         "12c61b4eb5c3d1dd27b8507194d0cb71270454d6",
          [
           null,
           {
@@ -463724,7 +463897,7 @@
          ]
         ],
         "xhr.http.html": [
-         "8db35518f512471e15d01a360d2a7ac7d8c66a80",
+         "4bbf83cbe5e77dd5d9cb1eaf9296407c9c072299",
          [
           null,
           {
@@ -463744,7 +463917,7 @@
          ]
         ],
         "fetch.http.html": [
-         "487709f01e98d3ec5354996bc92abef5680804af",
+         "f382044bad94790082eb65f8f3e75b7b9f81a213",
          [
           null,
           {
@@ -463798,7 +463971,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "e3e564ea5d6c35b409eace382cbe8f76146830fd",
+         "12c61b4eb5c3d1dd27b8507194d0cb71270454d6",
          [
           null,
           {
@@ -463807,7 +463980,7 @@
          ]
         ],
         "xhr.http.html": [
-         "8db35518f512471e15d01a360d2a7ac7d8c66a80",
+         "4bbf83cbe5e77dd5d9cb1eaf9296407c9c072299",
          [
           null,
           {
@@ -463827,7 +464000,7 @@
          ]
         ],
         "fetch.http.html": [
-         "487709f01e98d3ec5354996bc92abef5680804af",
+         "f382044bad94790082eb65f8f3e75b7b9f81a213",
          [
           null,
           {
@@ -463845,7 +464018,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "cfe20a86dd191a5dd79fb44e9706b557cb49c6c8",
+         "00f7e69b577d8192cca5f4530aeb5fa1d06c4757",
          [
           null,
           {
@@ -463872,7 +464045,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a3b4f54713b7c7d3efb4fae5a6b2a45682f90d66",
+         "ed4c29375ea77277e629016a10dfd6ba597fed33",
          [
           null,
           {
@@ -463901,7 +464074,7 @@
        },
        "unsafe-url": {
         "a-tag.http.html": [
-         "ce70318c4ca05bc8a6c4b99d96d17006552870cf",
+         "55a4ab590eb62f454491c9c05f4960118b70fd98",
          [
           null,
           {
@@ -463910,7 +464083,7 @@
          ]
         ],
         "fetch.http.html": [
-         "e4b6a9130f916fe9b37b33f31c2a6d8fd40b9bea",
+         "f766c2d37f9ad29474272307d0d768526f0f660c",
          [
           null,
           {
@@ -463919,7 +464092,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "75d4c872dd119ad4a744138d93271b69e24cf831",
+         "213d16bf07c5ab6b13e439d490ce63435ae583c6",
          [
           null,
           {
@@ -463928,7 +464101,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "adda1c2a81fa264f7c1d597bce04c7453ebb2c63",
+         "2b3587e828bc2f091c5b4dc899483c06aae316f5",
          [
           null,
           {
@@ -463937,7 +464110,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "d94a5308475a8f8a7e3cd0c990ddea3a6a1a8c11",
+         "888ef8183d852d0bc3a6ee63da992dd797b79df5",
          [
           null,
           {
@@ -463955,7 +464128,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a3b4f54713b7c7d3efb4fae5a6b2a45682f90d66",
+         "ed4c29375ea77277e629016a10dfd6ba597fed33",
          [
           null,
           {
@@ -463973,7 +464146,7 @@
          ]
         ],
         "xhr.http.html": [
-         "76e9bca4bb13ad0449a908d81d00802583a10fac",
+         "6b1681106a2a7cedbf7d965578d4ef794f26cbfb",
          [
           null,
           {
@@ -463984,7 +464157,7 @@
        },
        "unset": {
         "a-tag.http.html": [
-         "e0f063f12688f424606e4494fe4612171cb7e6ab",
+         "55a4ab590eb62f454491c9c05f4960118b70fd98",
          [
           null,
           {
@@ -463993,7 +464166,7 @@
          ]
         ],
         "fetch.http.html": [
-         "a269ab293549cf066064fe708dd4d078c91a6493",
+         "f766c2d37f9ad29474272307d0d768526f0f660c",
          [
           null,
           {
@@ -464002,7 +464175,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "07b8ec6f639247173e925c711be7603c18265bcf",
+         "213d16bf07c5ab6b13e439d490ce63435ae583c6",
          [
           null,
           {
@@ -464011,7 +464184,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "63a7988833790e46bfe772c17716c705adaa10b6",
+         "2b3587e828bc2f091c5b4dc899483c06aae316f5",
          [
           null,
           {
@@ -464020,7 +464193,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "6415ff567e74bc744648fbe2cb54258100287d5e",
+         "888ef8183d852d0bc3a6ee63da992dd797b79df5",
          [
           null,
           {
@@ -464038,7 +464211,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a3b4f54713b7c7d3efb4fae5a6b2a45682f90d66",
+         "ed4c29375ea77277e629016a10dfd6ba597fed33",
          [
           null,
           {
@@ -464047,7 +464220,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "e3e564ea5d6c35b409eace382cbe8f76146830fd",
+         "12c61b4eb5c3d1dd27b8507194d0cb71270454d6",
          [
           null,
           {
@@ -464056,7 +464229,7 @@
          ]
         ],
         "xhr.http.html": [
-         "53708453cd42f3c8b17516d87ca21ca8437b9e79",
+         "6b1681106a2a7cedbf7d965578d4ef794f26cbfb",
          [
           null,
           {
@@ -464069,7 +464242,7 @@
       "top.meta": {
        "no-referrer-when-downgrade": {
         "a-tag.http.html": [
-         "0832258c2ceca0fb588abf5f6948a48162af459d",
+         "ca36f256e28da3d1d63f0f341f88c0f192058758",
          [
           null,
           {
@@ -464078,7 +464251,7 @@
          ]
         ],
         "fetch.http.html": [
-         "be72e4b4ab0e393bcdf5a2706a71a730be246309",
+         "8d7a411faac7207aecf6f0edbfee4d64bff0609b",
          [
           null,
           {
@@ -464087,7 +464260,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "a4bb979ae1ff7f0a3b764c2c4b7960aeff6c0d2c",
+         "03297e0b52b219568e92f9abae3ca3291c0d33a7",
          [
           null,
           {
@@ -464096,7 +464269,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "d1c8f5e0123e66b0473567076ef70b28306f56ba",
+         "f8e9a9c6e93d07bafceb9ca36072d1b8b5ffadab",
          [
           null,
           {
@@ -464105,7 +464278,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "6639f77d3c9a8c07ac67893c28653e7ddc20d7b4",
+         "1aeaea79294bd4e636c75cd8878d4e475f99493e",
          [
           null,
           {
@@ -464141,7 +464314,7 @@
          ]
         ],
         "xhr.http.html": [
-         "bf27c6d7d5b6a850c61ddc1a1c18198eab54dd7a",
+         "760a3040d8d0bda9936edf6d2088cb7a791f88f0",
          [
           null,
           {
@@ -464170,7 +464343,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "a473081e1a4d97bc163343d846e2b2c3b6591279",
+         "d7b7b1dbf4f9da43bb9047de587ea9b055da28dc",
          [
           null,
           {
@@ -464197,7 +464370,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "6070c955b0f47f85f9b552ff7aa2978cfa7b2530",
+         "3694ed7f94274826295ab8052695bbfb0cf2483f",
          [
           null,
           {
@@ -464206,7 +464379,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "ca723b743f5d9c6a5773faa62bc63e2042abcd21",
+         "02a4792f0d03ba106e4d44d5b49c391ec4f03ee2",
          [
           null,
           {
@@ -464224,7 +464397,7 @@
          ]
         ],
         "xhr.http.html": [
-         "a5c9bc636e98e54cdcf0af44eba479e347957542",
+         "0be8f5d222801cc5ea627941035642093d17f2f7",
          [
           null,
           {
@@ -464244,7 +464417,7 @@
          ]
         ],
         "fetch.http.html": [
-         "aef048ae3967b61b3256112d7759632c66915703",
+         "1f245254af35a94ec40e4bc31d5ca66680d590fb",
          [
           null,
           {
@@ -464253,7 +464426,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "191133231aad8e516d884821ef3c7bd9ebc0b8c2",
+         "76c8c9504508f7bbba71f418d1f81357f9e64e98",
          [
           null,
           {
@@ -464271,7 +464444,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "4235e62f1b0ec2aef4f8eee59e260dc6763cdf90",
+         "8c27ac573027f45166a1c611568a686e3c7f6a72",
          [
           null,
           {
@@ -464280,7 +464453,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "c405955bd8860cd1907414c3fc132e627c36aa8f",
+         "604a56b3aa6b3151445dcdab1984e9fd51a0d56e",
          [
           null,
           {
@@ -464289,7 +464462,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "49b42a9b2e691443e0824b1409651e9e27632f76",
+         "083e588f2e0fcc87eeab76263300f359e99616b3",
          [
           null,
           {
@@ -464298,7 +464471,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "226bb2905b978dc98552f477f960b392997055a2",
+         "11845c01c209043c70484b1efb617c26ff827c03",
          [
           null,
           {
@@ -464327,7 +464500,7 @@
          ]
         ],
         "fetch.http.html": [
-         "281940c1e142d762496edea6f388b8f4705b432a",
+         "57932b2a5d8bc04cf1a5f78afc33aa8e23398b4f",
          [
           null,
           {
@@ -464345,7 +464518,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "54bbd4480bd2b4fb9e0665415c88c45140835b6f",
+         "aba97cbd2f97c3efdd90263a2b22bb8d7547b7eb",
          [
           null,
           {
@@ -464372,7 +464545,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "b93e49112f814149fe29650969106989f777adee",
+         "c3b1a964592ad52288e1586432c88c580f86b5ed",
          [
           null,
           {
@@ -464401,7 +464574,7 @@
        },
        "unsafe-url": {
         "a-tag.http.html": [
-         "2b6f54264585ca9a7cbb46d224900e9e2372aa8e",
+         "0206ccc83c0cc0a76de75f9067b8c314eca75eb1",
          [
           null,
           {
@@ -464410,7 +464583,7 @@
          ]
         ],
         "fetch.http.html": [
-         "e6c70ea16a3270c47b7a574aebce4e167b3bd673",
+         "3f4d829ea57a16d4aeffd1f6c82af44f53a2cdfe",
          [
           null,
           {
@@ -464419,7 +464592,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "aea5730cd8603d1b4b969f7f3644326282a43dd8",
+         "6375f350adaee2eb17c5e13c5ae1c1f8b5ed5fcc",
          [
           null,
           {
@@ -464428,7 +464601,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "3897b720712fe070a3abab0623cdcc2fcee8e3f4",
+         "09dc074ff701c6d6c5e338b0b7c0be5e68c7b7d1",
          [
           null,
           {
@@ -464437,7 +464610,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "0e622d5b29f9ce5283d34b1f10a9eb8469cfe5bb",
+         "5b9cff8a4ff29d5f8acb2cdacea7a95fee66ede9",
          [
           null,
           {
@@ -464455,7 +464628,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "78b384b232073df0ab70d20e11b84346b1e791ef",
+         "9a1084e625b7c0c0ef65bd81a60f317fab6b848a",
          [
           null,
           {
@@ -464464,7 +464637,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "d03178e4e7779ddb2927ad7e18f13c4754424ade",
+         "d9559312accfb19ade8065476b4f7ac3a4596b53",
          [
           null,
           {
@@ -464473,7 +464646,7 @@
          ]
         ],
         "xhr.http.html": [
-         "fdb9ebf3acde96a6d6a67dab057fd3d09e930ea2",
+         "eec1fe65e793fa10087a525bbad8e018c5dc61b9",
          [
           null,
           {
@@ -464484,7 +464657,7 @@
        },
        "unset": {
         "a-tag.http.html": [
-         "bc3590bb6ec3f9ae9c0a38679e27f00f5f407aef",
+         "55a4ab590eb62f454491c9c05f4960118b70fd98",
          [
           null,
           {
@@ -464493,7 +464666,7 @@
          ]
         ],
         "fetch.http.html": [
-         "b8e93ffa8f6fb60a47516d08f2175a1f5085022e",
+         "f766c2d37f9ad29474272307d0d768526f0f660c",
          [
           null,
           {
@@ -464502,7 +464675,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "47ed51e98c451ee45b28984d9dab4e3194d998b4",
+         "213d16bf07c5ab6b13e439d490ce63435ae583c6",
          [
           null,
           {
@@ -464511,7 +464684,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "dc5824246a6a6d4b55667da4e29dcb7c9e6664df",
+         "2b3587e828bc2f091c5b4dc899483c06aae316f5",
          [
           null,
           {
@@ -464520,7 +464693,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "d5fd16df68046f25e0ba9b2e893616fc7602ecbb",
+         "888ef8183d852d0bc3a6ee63da992dd797b79df5",
          [
           null,
           {
@@ -464529,7 +464702,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "682959ab4e4375a35c1a44e1cabc8f20318f52d1",
+         "79dee1335877fd54ec8b4930d42e5c1a1649b8a6",
          [
           null,
           {
@@ -464538,7 +464711,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a3b4f54713b7c7d3efb4fae5a6b2a45682f90d66",
+         "ed4c29375ea77277e629016a10dfd6ba597fed33",
          [
           null,
           {
@@ -464547,7 +464720,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "e3e564ea5d6c35b409eace382cbe8f76146830fd",
+         "12c61b4eb5c3d1dd27b8507194d0cb71270454d6",
          [
           null,
           {
@@ -464556,7 +464729,7 @@
          ]
         ],
         "xhr.http.html": [
-         "6c145d5a79bf5993046d38508871d23c4784d681",
+         "6b1681106a2a7cedbf7d965578d4ef794f26cbfb",
          [
           null,
           {
@@ -464582,7 +464755,7 @@
          ]
         ],
         "fetch.http.html": [
-         "7a52abfcb04d1cfc393c1d9fe6cf734f6dfffb9a",
+         "8f682e685a77264a3174fc027060fc00fc1b02d6",
          [
           null,
           {
@@ -464591,7 +464764,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "6890e3456d82d2181cf7ea71adc3595e960ac65b",
+         "31111c3cce4a5895dd834a33abd28c5e45936a57",
          [
           null,
           {
@@ -464600,7 +464773,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "9e029dd3cec7ce08fa6032392eb73bc883e3f54e",
+         "5985002bc775d96de73e70ac8753a55e0c98b4bd",
          [
           null,
           {
@@ -464609,7 +464782,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "3284b14cff3222ed0725678240bd9d2cffc2997d",
+         "4a62f71b44f770799f9a23a3a5ecd3e1705f039c",
          [
           null,
           {
@@ -464645,7 +464818,7 @@
          ]
         ],
         "xhr.http.html": [
-         "7c36ab3734ed26a2147a5353831e02765cedc7a6",
+         "95ef48cdbbdb7a50065f111cc0cabf5343952172",
          [
           null,
           {
@@ -464665,7 +464838,7 @@
          ]
         ],
         "fetch.http.html": [
-         "77faf61f5b1519ab59e1253904cfc91e20d42cdb",
+         "74334b36ccfeb390d4b3b704bc7ddca586b7cbd5",
          [
           null,
           {
@@ -464674,7 +464847,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "8525ee2c023d0986138911b459625583eef61e68",
+         "569b0ac8e2137e9630095d41b18a9f25cb89ca49",
          [
           null,
           {
@@ -464683,7 +464856,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "7372c260437cd7877cee2daf7ed6e3039ba7f730",
+         "e04c767ed5c1e783996c36fbe832fc1ea3454239",
          [
           null,
           {
@@ -464692,7 +464865,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "1d118d023b4c061638d948621ad7684c4018de9f",
+         "ca1042d6a6fcff4d7f79ddebc2b8f9a800542073",
          [
           null,
           {
@@ -464701,7 +464874,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "1d7a189083438ce0f1278e9417774fd709e410e0",
+         "6feb01bda6dd0c3d7fb25826a94140ceb854eb86",
          [
           null,
           {
@@ -464710,7 +464883,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "b631db09f799ccacdd9688e212380570ea3cc69b",
+         "43642c590dc99720ada68fee72960f2981a113ad",
          [
           null,
           {
@@ -464719,7 +464892,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "522d74ed28cb209c6cfe1d21177094bb26ba2471",
+         "0d35924ddd1b8084893337dcea4115082e930672",
          [
           null,
           {
@@ -464728,7 +464901,7 @@
          ]
         ],
         "xhr.http.html": [
-         "82ecb1461f5bab8183e7cc068fcc840cb1da4062",
+         "7814f3492d4ff5a9aa4540a5fe9c0982e749c36c",
          [
           null,
           {
@@ -464748,7 +464921,7 @@
          ]
         ],
         "fetch.http.html": [
-         "77faf61f5b1519ab59e1253904cfc91e20d42cdb",
+         "74334b36ccfeb390d4b3b704bc7ddca586b7cbd5",
          [
           null,
           {
@@ -464802,7 +464975,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "522d74ed28cb209c6cfe1d21177094bb26ba2471",
+         "0d35924ddd1b8084893337dcea4115082e930672",
          [
           null,
           {
@@ -464811,7 +464984,7 @@
          ]
         ],
         "xhr.http.html": [
-         "82ecb1461f5bab8183e7cc068fcc840cb1da4062",
+         "7814f3492d4ff5a9aa4540a5fe9c0982e749c36c",
          [
           null,
           {
@@ -464831,7 +465004,7 @@
          ]
         ],
         "fetch.http.html": [
-         "77faf61f5b1519ab59e1253904cfc91e20d42cdb",
+         "74334b36ccfeb390d4b3b704bc7ddca586b7cbd5",
          [
           null,
           {
@@ -464849,7 +465022,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "7372c260437cd7877cee2daf7ed6e3039ba7f730",
+         "e04c767ed5c1e783996c36fbe832fc1ea3454239",
          [
           null,
           {
@@ -464876,7 +465049,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "b631db09f799ccacdd9688e212380570ea3cc69b",
+         "43642c590dc99720ada68fee72960f2981a113ad",
          [
           null,
           {
@@ -464905,7 +465078,7 @@
        },
        "unsafe-url": {
         "a-tag.http.html": [
-         "47c6f86a454a10b539971f71e0123103f599d7b0",
+         "2641813ea703dbf9626e59c3d4b001d40d125e09",
          [
           null,
           {
@@ -464914,7 +465087,7 @@
          ]
         ],
         "fetch.http.html": [
-         "9b511a90b1fd14656bd0156e7c42ca5c118d38de",
+         "8f682e685a77264a3174fc027060fc00fc1b02d6",
          [
           null,
           {
@@ -464923,7 +465096,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "5b196b97d781ec53a6bfb11803028a95d280bab5",
+         "31111c3cce4a5895dd834a33abd28c5e45936a57",
          [
           null,
           {
@@ -464932,7 +465105,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "6cbecbcd0e5916b74b95f1aee944301f8be58228",
+         "5985002bc775d96de73e70ac8753a55e0c98b4bd",
          [
           null,
           {
@@ -464941,7 +465114,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "6473cf3ed00bde72f5056d2425178c8bc6b83f76",
+         "4a62f71b44f770799f9a23a3a5ecd3e1705f039c",
          [
           null,
           {
@@ -464959,7 +465132,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "b631db09f799ccacdd9688e212380570ea3cc69b",
+         "43642c590dc99720ada68fee72960f2981a113ad",
          [
           null,
           {
@@ -464977,7 +465150,7 @@
          ]
         ],
         "xhr.http.html": [
-         "b211b0aba447b18b6dbedd19068d246660903eb8",
+         "95ef48cdbbdb7a50065f111cc0cabf5343952172",
          [
           null,
           {
@@ -464988,7 +465161,7 @@
        },
        "unset": {
         "a-tag.http.html": [
-         "e76f2828a22f83daf0f3a2ef5c0b902c02907273",
+         "2641813ea703dbf9626e59c3d4b001d40d125e09",
          [
           null,
           {
@@ -464997,7 +465170,7 @@
          ]
         ],
         "fetch.http.html": [
-         "559e6625dcd72d5d0b37cc4dfdb4e83398abbea8",
+         "8f682e685a77264a3174fc027060fc00fc1b02d6",
          [
           null,
           {
@@ -465006,7 +465179,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "c37ef9f5f2b9be3bcf429fe15c4e5761a080bc11",
+         "31111c3cce4a5895dd834a33abd28c5e45936a57",
          [
           null,
           {
@@ -465015,7 +465188,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "400a1a61b067057a426396e06c37c1561c4bbea7",
+         "5985002bc775d96de73e70ac8753a55e0c98b4bd",
          [
           null,
           {
@@ -465024,7 +465197,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "48e20a1fbd6fc03d192770b103132b639a880b1b",
+         "4a62f71b44f770799f9a23a3a5ecd3e1705f039c",
          [
           null,
           {
@@ -465042,7 +465215,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "b631db09f799ccacdd9688e212380570ea3cc69b",
+         "43642c590dc99720ada68fee72960f2981a113ad",
          [
           null,
           {
@@ -465051,7 +465224,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "522d74ed28cb209c6cfe1d21177094bb26ba2471",
+         "0d35924ddd1b8084893337dcea4115082e930672",
          [
           null,
           {
@@ -465060,7 +465233,7 @@
          ]
         ],
         "xhr.http.html": [
-         "31521e2af24c65cb247d15963cc0f50e13b121ab",
+         "95ef48cdbbdb7a50065f111cc0cabf5343952172",
          [
           null,
           {
@@ -465073,7 +465246,7 @@
       "top.meta": {
        "no-referrer-when-downgrade": {
         "a-tag.http.html": [
-         "02a217ca4a18924dbe611aca3bc3c9d3f23101bb",
+         "ca14aa2021ea702ab20e2c964dcb903f799d31ee",
          [
           null,
           {
@@ -465082,7 +465255,7 @@
          ]
         ],
         "fetch.http.html": [
-         "fd37e90f6c1c7118171cfe55ab76c60ba926ad83",
+         "30c1f6b7b3c34f57b19d826dc550a8b8a4d1dad9",
          [
           null,
           {
@@ -465091,7 +465264,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "61ff8eba33887b1d9122d08edcfa12371711456a",
+         "fddad739594c76e702e180d6d1befa466f35b0a5",
          [
           null,
           {
@@ -465100,7 +465273,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "a1dd667425aef577902146e171b452594b9ae189",
+         "fc9f483852807baffb1a83313ab2393f04c7ad2c",
          [
           null,
           {
@@ -465109,7 +465282,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "6733f8da9874901390296654e49ed4b952f1f6b3",
+         "b49b75993d8a65b2c0a670491354d5c2164bac92",
          [
           null,
           {
@@ -465145,7 +465318,7 @@
          ]
         ],
         "xhr.http.html": [
-         "8f24877788425341cc5131d90d58de439652ec7b",
+         "1ebfe2059a0f7dd9a781e5c9e1f9204eb429b94e",
          [
           null,
           {
@@ -465174,7 +465347,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "3eeacc5cd307f4fb4f5bb2e9158422713a058b7c",
+         "9a36013b9cdc2dd0e88e48108c4b1cb583790c37",
          [
           null,
           {
@@ -465201,7 +465374,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "2fcb8233b1c6d3d6f3fc608fb3bebb3781d52fef",
+         "51d2a157acb76f129f727aedeb28e5c8979c3559",
          [
           null,
           {
@@ -465210,7 +465383,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "ca2e54ea997e25521b2fb46f0ce2559a76d7c6ec",
+         "9d227d62940acbc0ed8b832a2a38e4d0f7df39a1",
          [
           null,
           {
@@ -465228,7 +465401,7 @@
          ]
         ],
         "xhr.http.html": [
-         "d7d3a914365cc6607b28d4882f75a219761d387d",
+         "3cdbc538f2cf476741e1e150a9c93b17a4807db4",
          [
           null,
           {
@@ -465248,7 +465421,7 @@
          ]
         ],
         "fetch.http.html": [
-         "be55f6567f646fd040e12342d6d6e279fdc66bde",
+         "c1bfe063975268fc17b6fdb47d8fb76bc6a2724e",
          [
           null,
           {
@@ -465257,7 +465430,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "caf9e4cd05277d985374a7768d261f4c3133ae52",
+         "dc3e359db0dd7fcf4d012b8835ba0a9b0ecee7de",
          [
           null,
           {
@@ -465275,7 +465448,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "61c439ab73fc83e5e94e115fc0396e28d3db97d7",
+         "5e74d39b65f440bec0a4e4e804bcfce00c68218c",
          [
           null,
           {
@@ -465284,7 +465457,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "c95997bbc6b9882578b9ebfbc3ca342b72b5e811",
+         "b6d27e31b5d4034d6514f98b4d943665bb5681e6",
          [
           null,
           {
@@ -465293,7 +465466,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "20575af9d79e4fdc249036ed3c544b7926f80fad",
+         "6090d396ee1b75101934f59b871b9b1cd8c0d826",
          [
           null,
           {
@@ -465302,7 +465475,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "d17ca46153cb5b261aec3026e96883b7947df18c",
+         "bbf7a826253fc610bd94972e539a831c5bd28c96",
          [
           null,
           {
@@ -465331,7 +465504,7 @@
          ]
         ],
         "fetch.http.html": [
-         "0ed5cfeb3f2ae227eec12022468ad7c8a87fc4a7",
+         "25e1379e0dcc5b71328bb998ae465aea11d649dc",
          [
           null,
           {
@@ -465349,7 +465522,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "97dc6711c553ef8f184d7be92575b7a87cdf5c19",
+         "f61f8d67a0a98162484d1fba64759d883a1855fb",
          [
           null,
           {
@@ -465376,7 +465549,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a0b0bb783c0e964bb5310e078a093836d9f3e796",
+         "81f54227d1abbad927f3ba16164f36ce878a98fe",
          [
           null,
           {
@@ -465405,7 +465578,7 @@
        },
        "unsafe-url": {
         "a-tag.http.html": [
-         "a23aaec6c7b488cfbe692fafb822db3dad4c390a",
+         "93f874f51d7eae504c295b4d62ae121fc4a19a4b",
          [
           null,
           {
@@ -465414,7 +465587,7 @@
          ]
         ],
         "fetch.http.html": [
-         "da471988708d132f622a63350e104eef540bb602",
+         "73b2f579516e3b054cfe85757c6b2dcebe274f53",
          [
           null,
           {
@@ -465423,7 +465596,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "a7eef16bc7725b288dbc9182df2139d14667fd88",
+         "66b331a4f50120253a9cd07d502ade9b41b1d913",
          [
           null,
           {
@@ -465432,7 +465605,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "350d6fac65fcb43b0d66fc5b183d98895087e80c",
+         "9f59d065e94565b76a6f50c525f2ccdc9f4bfd15",
          [
           null,
           {
@@ -465441,7 +465614,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "ce77afe15afe8d435b6904d8726725e65255fc7f",
+         "d09be02124fb129edb2b458859b301eefbf44512",
          [
           null,
           {
@@ -465459,7 +465632,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "3bd51f722ba5521c3d491061ad02a10b6eaee42d",
+         "f7ff65bd6b1cf524c282ef438a3ca5359bde9fcd",
          [
           null,
           {
@@ -465468,7 +465641,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "d59c06f0b84a14ec5ed1bec8cf1db862170d9cd5",
+         "48482da94f51a0a6ef2a0ee2ec3a6f4f19039158",
          [
           null,
           {
@@ -465477,7 +465650,7 @@
          ]
         ],
         "xhr.http.html": [
-         "2dd3da340ade9058d2cf3988872cacf06db36651",
+         "5496264121fdc26aef9c90bfe562afbec6c2573a",
          [
           null,
           {
@@ -465488,7 +465661,7 @@
        },
        "unset": {
         "a-tag.http.html": [
-         "e1a24a80980bec8297c0525f853b0e0d00a8706c",
+         "2641813ea703dbf9626e59c3d4b001d40d125e09",
          [
           null,
           {
@@ -465497,7 +465670,7 @@
          ]
         ],
         "fetch.http.html": [
-         "fd6c749e971bd1c20dfae10aaa2b9a697fe59805",
+         "8f682e685a77264a3174fc027060fc00fc1b02d6",
          [
           null,
           {
@@ -465506,7 +465679,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "e292a0cf2bc8373f594929dd76553af825e6b263",
+         "31111c3cce4a5895dd834a33abd28c5e45936a57",
          [
           null,
           {
@@ -465515,7 +465688,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "a2509f9f047ef958434f8cefebfc7c0d2fd42606",
+         "5985002bc775d96de73e70ac8753a55e0c98b4bd",
          [
           null,
           {
@@ -465524,7 +465697,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "4f4a79210f4c341545167361068fa522c25c5561",
+         "4a62f71b44f770799f9a23a3a5ecd3e1705f039c",
          [
           null,
           {
@@ -465533,7 +465706,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "1d7a189083438ce0f1278e9417774fd709e410e0",
+         "6feb01bda6dd0c3d7fb25826a94140ceb854eb86",
          [
           null,
           {
@@ -465542,7 +465715,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "b631db09f799ccacdd9688e212380570ea3cc69b",
+         "43642c590dc99720ada68fee72960f2981a113ad",
          [
           null,
           {
@@ -465551,7 +465724,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "522d74ed28cb209c6cfe1d21177094bb26ba2471",
+         "0d35924ddd1b8084893337dcea4115082e930672",
          [
           null,
           {
@@ -465560,7 +465733,7 @@
          ]
         ],
         "xhr.http.html": [
-         "2da993756a64a4abb071db4e279936d6181eed23",
+         "95ef48cdbbdb7a50065f111cc0cabf5343952172",
          [
           null,
           {
@@ -465586,7 +465759,7 @@
          ]
         ],
         "fetch.http.html": [
-         "86f3190282cd37c0cf9c2c19a6fcc3960ef18250",
+         "d0cb7206f8a6e4b2c8a5e8968db3a8eee67bc99f",
          [
           null,
           {
@@ -465595,7 +465768,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "6cda672ecab548d16612ac9ad1f50a6b2a7e0236",
+         "fbb87846a7a95649786fe1595946e047010c4aa0",
          [
           null,
           {
@@ -465604,7 +465777,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "59bcdb3c33e9d98cd18f80805cbaa60231ac1988",
+         "1433505d9aaacb424fd72fce0b6e0198efd6dcec",
          [
           null,
           {
@@ -465613,7 +465786,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "5f7d210d0e8bc12bc6b015c1864a0e51a37b5528",
+         "0e7bad7b16d3e61c13397afbb38378a5c676dd8d",
          [
           null,
           {
@@ -465649,7 +465822,7 @@
          ]
         ],
         "xhr.http.html": [
-         "ba2a63edcf2985fd5961c2c3291a3d66ec42e5cd",
+         "81df08c87e7e95f430b8e25b3fdd35edd73d8bce",
          [
           null,
           {
@@ -465669,7 +465842,7 @@
          ]
         ],
         "fetch.http.html": [
-         "fd8caf645b8d363eeab3b2dc2bcf6d1050034356",
+         "2b840d4aec5ac2f749620973272660bc10c160e0",
          [
           null,
           {
@@ -465678,7 +465851,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "b65aef9ce0d0b87ad70099965e6e6bfc7a428414",
+         "cf605923b809de5fc1d03a90d8c3633c4c3dbf1a",
          [
           null,
           {
@@ -465687,7 +465860,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "89e722798a6bd758aa81888db77b227cc3308de4",
+         "111862a7dc50e1e374c5b05239c9c24b8fa603b7",
          [
           null,
           {
@@ -465696,7 +465869,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "dc485678e76a47f25e3f4f05528b124c0607a0cd",
+         "abdb19514017e01c8476ef6165022456a754bd24",
          [
           null,
           {
@@ -465705,7 +465878,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "e0d775cee1d604917f0550bf582db9381dd36f17",
+         "7365afae6f1b7fa3226a2a2e3126fbfb0138c87e",
          [
           null,
           {
@@ -465714,7 +465887,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "3f57cf8c8079870ffe77924338575b0c4fc21a9c",
+         "2533e15216593eb6eb7e2cfcc6b1228b6228f724",
          [
           null,
           {
@@ -465723,7 +465896,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "16665a4146f2d852ec838533aa7a0230610acc39",
+         "8190dfcdd4226e7e5793b9d9047091414fd8a0fc",
          [
           null,
           {
@@ -465732,7 +465905,7 @@
          ]
         ],
         "xhr.http.html": [
-         "6f09ea6b097ee9e50e80b8e4994bf05738cfd561",
+         "b0bcb0a901b56171895926cafc73e2bcafb7061b",
          [
           null,
           {
@@ -465752,7 +465925,7 @@
          ]
         ],
         "fetch.http.html": [
-         "fd8caf645b8d363eeab3b2dc2bcf6d1050034356",
+         "2b840d4aec5ac2f749620973272660bc10c160e0",
          [
           null,
           {
@@ -465806,7 +465979,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "16665a4146f2d852ec838533aa7a0230610acc39",
+         "8190dfcdd4226e7e5793b9d9047091414fd8a0fc",
          [
           null,
           {
@@ -465815,7 +465988,7 @@
          ]
         ],
         "xhr.http.html": [
-         "6f09ea6b097ee9e50e80b8e4994bf05738cfd561",
+         "b0bcb0a901b56171895926cafc73e2bcafb7061b",
          [
           null,
           {
@@ -465835,7 +466008,7 @@
          ]
         ],
         "fetch.http.html": [
-         "fd8caf645b8d363eeab3b2dc2bcf6d1050034356",
+         "2b840d4aec5ac2f749620973272660bc10c160e0",
          [
           null,
           {
@@ -465853,7 +466026,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "89e722798a6bd758aa81888db77b227cc3308de4",
+         "111862a7dc50e1e374c5b05239c9c24b8fa603b7",
          [
           null,
           {
@@ -465880,7 +466053,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "3f57cf8c8079870ffe77924338575b0c4fc21a9c",
+         "2533e15216593eb6eb7e2cfcc6b1228b6228f724",
          [
           null,
           {
@@ -465909,7 +466082,7 @@
        },
        "unsafe-url": {
         "a-tag.http.html": [
-         "e6ba204e5847cf7b0bbd414c84f591bd4ecfa24c",
+         "19c55517e84867f50ddf5fe1ad9009f546fdb494",
          [
           null,
           {
@@ -465918,7 +466091,7 @@
          ]
         ],
         "fetch.http.html": [
-         "61e09140e003f3b36fae1d38578372a4a3ed9b7b",
+         "d0cb7206f8a6e4b2c8a5e8968db3a8eee67bc99f",
          [
           null,
           {
@@ -465927,7 +466100,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "e9ff9a1093c7f26f5f856f343edff9a403c70025",
+         "fbb87846a7a95649786fe1595946e047010c4aa0",
          [
           null,
           {
@@ -465936,7 +466109,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "1df6d3696607755e63f7a6185fdf3b4209c531f6",
+         "1433505d9aaacb424fd72fce0b6e0198efd6dcec",
          [
           null,
           {
@@ -465945,7 +466118,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "bfb28f549d1f53810b8e49daefebd9de34332ec2",
+         "0e7bad7b16d3e61c13397afbb38378a5c676dd8d",
          [
           null,
           {
@@ -465963,7 +466136,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "3f57cf8c8079870ffe77924338575b0c4fc21a9c",
+         "2533e15216593eb6eb7e2cfcc6b1228b6228f724",
          [
           null,
           {
@@ -465981,7 +466154,7 @@
          ]
         ],
         "xhr.http.html": [
-         "cef94764b50b38a3b758cf60e98c8c06f16be417",
+         "81df08c87e7e95f430b8e25b3fdd35edd73d8bce",
          [
           null,
           {
@@ -465992,7 +466165,7 @@
        },
        "unset": {
         "a-tag.http.html": [
-         "016e9b54131971d670839a797974e1c9d0a69eb9",
+         "19c55517e84867f50ddf5fe1ad9009f546fdb494",
          [
           null,
           {
@@ -466001,7 +466174,7 @@
          ]
         ],
         "fetch.http.html": [
-         "a2ca63a2bad7ba457c40262c49c12737a3780697",
+         "d0cb7206f8a6e4b2c8a5e8968db3a8eee67bc99f",
          [
           null,
           {
@@ -466010,7 +466183,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "adeac7e1a5eff296d98035e28c23cd2345cc860c",
+         "fbb87846a7a95649786fe1595946e047010c4aa0",
          [
           null,
           {
@@ -466019,7 +466192,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "9591ce9bf6e8d69bed6f4f7d2ae2c5c3ccc9d2a9",
+         "1433505d9aaacb424fd72fce0b6e0198efd6dcec",
          [
           null,
           {
@@ -466028,7 +466201,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "198d4f0eb05ed3f4f77d49dbda117a178ce2625e",
+         "0e7bad7b16d3e61c13397afbb38378a5c676dd8d",
          [
           null,
           {
@@ -466046,7 +466219,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "3f57cf8c8079870ffe77924338575b0c4fc21a9c",
+         "2533e15216593eb6eb7e2cfcc6b1228b6228f724",
          [
           null,
           {
@@ -466055,7 +466228,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "16665a4146f2d852ec838533aa7a0230610acc39",
+         "8190dfcdd4226e7e5793b9d9047091414fd8a0fc",
          [
           null,
           {
@@ -466064,7 +466237,7 @@
          ]
         ],
         "xhr.http.html": [
-         "917b679f590205376db9182f18a8a6f3f893570d",
+         "81df08c87e7e95f430b8e25b3fdd35edd73d8bce",
          [
           null,
           {
@@ -466077,7 +466250,7 @@
       "top.meta": {
        "no-referrer-when-downgrade": {
         "a-tag.http.html": [
-         "ab450e5b6d47a0683dad613b4ddab31168433351",
+         "de2e5a9c490006ad6c8b40bd9a964dc0a06dccbd",
          [
           null,
           {
@@ -466086,7 +466259,7 @@
          ]
         ],
         "fetch.http.html": [
-         "b720b2845a7cb702f474982c8ad018ad34893063",
+         "983bdaa3bbcaf2dcaca7c9f0ee0df39b72489e17",
          [
           null,
           {
@@ -466095,7 +466268,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "c243338edba31e77f606a47d554facb251dfaf86",
+         "7f28364d6f600927f0b0cfb2af753aa9b35ed826",
          [
           null,
           {
@@ -466104,7 +466277,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "a6219f7b99c7ebc2bf1a80278d572777efa3e798",
+         "2f40d7d317299afa52844ca3f69ecdcca329a0b3",
          [
           null,
           {
@@ -466113,7 +466286,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "48046be9078ad2435053b512df2174b0a3c58455",
+         "9eb61cc176ce34c78794049807658142e52c0c2a",
          [
           null,
           {
@@ -466149,7 +466322,7 @@
          ]
         ],
         "xhr.http.html": [
-         "8c16d7dcf9195ebb43bb245b988b50f9209a56f5",
+         "3963f27bec0390f16e6e8b695d30f477a693e8ec",
          [
           null,
           {
@@ -466178,7 +466351,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "0de9a1a02ca63f9655a9f2e600a807ee83cc722d",
+         "46700793f0da82b921156e25b13a6a5797b7fcb8",
          [
           null,
           {
@@ -466205,7 +466378,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "6d5b7b41b62848e7a15e03390e7df656c9ae1204",
+         "3b8544271c488b3124aaea46d602cb75f8fb2ab5",
          [
           null,
           {
@@ -466214,7 +466387,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "dd809cbb7901c4cc210fdbd07ccb7b97f2fbf578",
+         "8800e866a9ea1ae445d5a201269f5d2ecd5b3758",
          [
           null,
           {
@@ -466232,7 +466405,7 @@
          ]
         ],
         "xhr.http.html": [
-         "cf0696c82512359d96c800d05f8e2a052cbcca11",
+         "3673e5e00ee7946af70a4c4413262528b08d076d",
          [
           null,
           {
@@ -466252,7 +466425,7 @@
          ]
         ],
         "fetch.http.html": [
-         "143b2bcc99a721d3bb87362a46dab1f9dab17d48",
+         "7f3ee713ec6beabcfb9bd042fdab34ad90f1ff4d",
          [
           null,
           {
@@ -466261,7 +466434,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "ad5f0c92c10f9e9413492c830d03f7068a778b71",
+         "abe57dfd774a144a53a7a479b128e5ed4ecd212a",
          [
           null,
           {
@@ -466279,7 +466452,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "b283ad25eb7d65cddef899e3cca7c541c9418c43",
+         "aa42aa5c051d99df4cdde0255401b34e6118d317",
          [
           null,
           {
@@ -466288,7 +466461,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "c805d122db4669af09e6814dfb1aa19bac1db346",
+         "cb27196125f05747ed288ebbb2b88bf2d7be3848",
          [
           null,
           {
@@ -466297,7 +466470,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "569dcf90334e1fe58115f3046e6b3424fd8c8063",
+         "a53a4c5894f52eb8db8b3a702426c39159c39d23",
          [
           null,
           {
@@ -466306,7 +466479,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "ef47493f9d789da757d66e13bbd39ace1879c059",
+         "cc23f56ac8f67cab28769b746693adcc09709fc0",
          [
           null,
           {
@@ -466335,7 +466508,7 @@
          ]
         ],
         "fetch.http.html": [
-         "2f3f938253cdda0e093d316aa2236694d1642100",
+         "3afa172d3d8f0066b7adfba925656efe6f5976b7",
          [
           null,
           {
@@ -466353,7 +466526,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "f13292a1f47c085e76ee9f7d56062bb8bc84f067",
+         "18758a748d1a702745f4bf78ab565d65e9f572d8",
          [
           null,
           {
@@ -466380,7 +466553,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "a418434e0c0804de8e551a130c384e0ae29a4727",
+         "c2f30c1143c729e0d86223035950cbd78e0b28f9",
          [
           null,
           {
@@ -466409,7 +466582,7 @@
        },
        "unsafe-url": {
         "a-tag.http.html": [
-         "41452ce220e0b8962c037bc784117792be089ff7",
+         "a2643f12a5ec23b13fc55a9f1ebe5dcde28d3429",
          [
           null,
           {
@@ -466418,7 +466591,7 @@
          ]
         ],
         "fetch.http.html": [
-         "a775f4563d25e4e7ed2e5dd1b9cfce556cbdb6af",
+         "3e506538da530856d10965ead367148d2679360d",
          [
           null,
           {
@@ -466427,7 +466600,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "3c606bb9d0c2d06b4f35ca2d8cd613b370fb29a8",
+         "5c6f19d46aeb54ca3780ae704f1cf90139e93a91",
          [
           null,
           {
@@ -466436,7 +466609,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "f1a05a7dd5a98afc41638fb8b575535213aa5a8d",
+         "d4bede06b5808a1b228037157732b1d9057bd3a1",
          [
           null,
           {
@@ -466445,7 +466618,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "177b2a39ddc99b628d25c947c14014a9212de637",
+         "94073a5f6ced8a7ce670410d7b6afb1800f8a441",
          [
           null,
           {
@@ -466463,7 +466636,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "26427318dc87bcfef033855e2060774daf95f8f0",
+         "aa24d06f9621d97291941b0358ec4d078c62a976",
          [
           null,
           {
@@ -466472,7 +466645,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "c0da272d349a0bcd1a35331ab52c59f77aa54090",
+         "95926627de7be4667a38be6a889e4d51b4955cde",
          [
           null,
           {
@@ -466481,7 +466654,7 @@
          ]
         ],
         "xhr.http.html": [
-         "0af057fc04e59a5ae8ea85f1e26e62ce2f83e106",
+         "bbb43ad68efa520e155d57a5c188e3286cc71c07",
          [
           null,
           {
@@ -466492,7 +466665,7 @@
        },
        "unset": {
         "a-tag.http.html": [
-         "5017723dc2348799ecda21c0b50f27ac75fec81e",
+         "19c55517e84867f50ddf5fe1ad9009f546fdb494",
          [
           null,
           {
@@ -466501,7 +466674,7 @@
          ]
         ],
         "fetch.http.html": [
-         "60124082878d68462ee197d5c8f61c3e5af2de6c",
+         "d0cb7206f8a6e4b2c8a5e8968db3a8eee67bc99f",
          [
           null,
           {
@@ -466510,7 +466683,7 @@
          ]
         ],
         "iframe-tag.http.html": [
-         "c5eaf1b9b52783e8fbec2e775800cb8fbfb779b7",
+         "fbb87846a7a95649786fe1595946e047010c4aa0",
          [
           null,
           {
@@ -466519,7 +466692,7 @@
          ]
         ],
         "img-tag.http.html": [
-         "a13f6b0beebb4f5b1a5567233046cc2fb5f08e76",
+         "1433505d9aaacb424fd72fce0b6e0198efd6dcec",
          [
           null,
           {
@@ -466528,7 +466701,7 @@
          ]
         ],
         "script-tag.http.html": [
-         "f34c612129bf698771732a563e9b41e452d54e3c",
+         "0e7bad7b16d3e61c13397afbb38378a5c676dd8d",
          [
           null,
           {
@@ -466537,7 +466710,7 @@
          ]
         ],
         "sharedworker-classic.http.html": [
-         "e0d775cee1d604917f0550bf582db9381dd36f17",
+         "7365afae6f1b7fa3226a2a2e3126fbfb0138c87e",
          [
           null,
           {
@@ -466546,7 +466719,7 @@
          ]
         ],
         "worker-classic.http.html": [
-         "3f57cf8c8079870ffe77924338575b0c4fc21a9c",
+         "2533e15216593eb6eb7e2cfcc6b1228b6228f724",
          [
           null,
           {
@@ -466555,7 +466728,7 @@
          ]
         ],
         "worker-module.http.html": [
-         "16665a4146f2d852ec838533aa7a0230610acc39",
+         "8190dfcdd4226e7e5793b9d9047091414fd8a0fc",
          [
           null,
           {
@@ -466564,7 +466737,7 @@
          ]
         ],
         "xhr.http.html": [
-         "ee1b205d66fcf0fd669abd60f5ff438a61a8d87b",
+         "81df08c87e7e95f430b8e25b3fdd35edd73d8bce",
          [
           null,
           {
@@ -466739,7 +466912,7 @@
         ]
        ],
        "fetch.http.html": [
-        "e656f126b8f012d794c474eb008915dc45381434",
+        "d523a3109f6b64520040572fd7fb7de110460ff3",
         [
          null,
          {
@@ -466748,7 +466921,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "d29c3c622268e82d6e694899f422d81839d1ce85",
+        "7761fb304d51363dee3025cc1cf0727dba039309",
         [
          null,
          {
@@ -466757,7 +466930,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "54cd926399dbed35498fdcb5fe5d679e9e378ee3",
+        "f71ded5fb6a58ca31460e6ae5bd8d041c5cf4722",
         [
          null,
          {
@@ -466766,7 +466939,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "bc615407a4e9f2a64826d9348d5fb1bce5932921",
+        "5430b987e16901e5cb6531757f2c0605adb01043",
         [
          null,
          {
@@ -466784,7 +466957,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "5ec048f59d49c06b866b51a52d72be7ca8acfab4",
+        "2991201b1d1576acda047ec18ba3f6c65b58d753",
         [
          null,
          {
@@ -466793,7 +466966,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "cd68479269fb3d20eb97002d79d81ea5af94fbd8",
+        "538136079f10579203c6307ed4e061fca76c8332",
         [
          null,
          {
@@ -466811,7 +466984,7 @@
         ]
        ],
        "xhr.http.html": [
-        "fee790d22f169640240d4a8f39dc86f021dafcb2",
+        "ab624c0248eac3e1604e57aa943148f4dd2eeb6c",
         [
          null,
          {
@@ -466822,7 +466995,7 @@
       },
       "no-referrer-when-downgrade": {
        "a-tag.http.html": [
-        "83deabb964346befb0f47d8a379896a477dfa99c",
+        "3a39abcf1f23e3f8e4b9b971d8a21cdfa84d17cc",
         [
          null,
          {
@@ -466831,7 +467004,7 @@
         ]
        ],
        "fetch.http.html": [
-        "280b37f57713c8bc49af438aeb4360bb9639b18e",
+        "397071f211562bf9e6ad414f6e230064b6f2070b",
         [
          null,
          {
@@ -466840,7 +467013,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "b005077ec42ce5cae0e735812520f04bf97ddb56",
+        "9f8954b579c442b02a1d23d4e753f6615878e798",
         [
          null,
          {
@@ -466849,7 +467022,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2fa2e60c8ab416d3ca97b55c1a632ed4a3a0262e",
+        "8cdcb555a0865872770b5b2f1f8266538167ddd3",
         [
          null,
          {
@@ -466858,7 +467031,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "d69fb429d60a6be78bed7d3796754aa5aaf027da",
+        "672db55921dc5a52995541b73692e5e98aadca48",
         [
          null,
          {
@@ -466867,7 +467040,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "95e23e87085080cbd2d3e77dde459c78fba681a7",
+        "750c2a0815317f5adc2dd8f2d28a9f1bee984d7e",
         [
          null,
          {
@@ -466903,7 +467076,7 @@
         ]
        ],
        "xhr.http.html": [
-        "cb0559d541d9a2f302ce5291507dc2cd5e29fb6e",
+        "0ab53c440b141e5128f6ae65e66f1bc364f5380f",
         [
          null,
          {
@@ -466914,7 +467087,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "c3cf3a422fdeda30777fac377689743fbf79e337",
+        "709a223295c369aa7dad45914cd940904758403a",
         [
          null,
          {
@@ -466923,7 +467096,7 @@
         ]
        ],
        "fetch.http.html": [
-        "66facac8c75a2a929aa8e5ab7218c7740524cd6e",
+        "08048d0994df3f1060ff30e4caf6c7f253260d46",
         [
          null,
          {
@@ -466932,7 +467105,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "6a63d04506352f9ce7c2df6a23c12397616ddda9",
+        "088f80a631b16d0f19341eab8eb22991c723c7b1",
         [
          null,
          {
@@ -466941,7 +467114,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "ba2428290c2e6ee67509e84dc876b4bd66162922",
+        "f139e412030907c48984d0e22d3736c0f7ccf450",
         [
          null,
          {
@@ -466950,7 +467123,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "5477d5e0f1648cb897b87c237af55f9ae9610077",
+        "beaff15cf7d75dda10a093400a90001926559402",
         [
          null,
          {
@@ -466977,7 +467150,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "a0b120e91faa0131f449fb4f64e2a0661d6086e4",
+        "f6c850fe4fd84860e29027623e90c820d30d46b2",
         [
          null,
          {
@@ -466995,7 +467168,7 @@
         ]
        ],
        "xhr.http.html": [
-        "61ad3f8a3dd2b5c5751e7a3b1e74ec15c08c0b9e",
+        "513efcf13e58614e2d4fff6bd314a76dcbb29a20",
         [
          null,
          {
@@ -467006,7 +467179,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "3dfaf48d8e881dc857b3aa3e5afe33553757d748",
+        "7b14b1ce47c390b114be329a8b30f3b85ca4112b",
         [
          null,
          {
@@ -467015,7 +467188,7 @@
         ]
        ],
        "fetch.http.html": [
-        "a8d571c113e989eec00379da55faec2ccf94fe96",
+        "33993c1ddf0105e7210b1dcc66b7d727736ea73e",
         [
          null,
          {
@@ -467024,7 +467197,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "712d1bae34a5b60c6f94642249e749fd09fba0e9",
+        "7d3edec9fafe0b367bfa6a458b4ad030db5b0a33",
         [
          null,
          {
@@ -467033,7 +467206,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "0615a66a3c342380784ca969a45cac935ec1685d",
+        "b035834c60ad0a254751be8de363003f11d35ac8",
         [
          null,
          {
@@ -467042,7 +467215,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "d1f11b76dada7f04734e2abc8185507dbf13f343",
+        "7aa957c07e6ba5c86a58a9d59040dfce90236fe4",
         [
          null,
          {
@@ -467060,7 +467233,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "a4787b55ff50e08aac6aea7c867cdc36f97cb6cc",
+        "1088e19bdbcf19e98ae1abd83bfdf9298d817218",
         [
          null,
          {
@@ -467069,7 +467242,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "ae01c8c17084b24e22afe22b67473431e0a5d99e",
+        "8729a24f09ee5f8286eeff26bd353968eeb8bb08",
         [
          null,
          {
@@ -467078,7 +467251,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "f9aaf2c4434baf4af423d6629c90e8559a37a54d",
+        "31639bac1bd3966a4302222a333d10d89c9b7887",
         [
          null,
          {
@@ -467087,7 +467260,7 @@
         ]
        ],
        "xhr.http.html": [
-        "a8534d09301e9ac1e83804082fd70460ec6055e8",
+        "434a6b35404e8c1e33c2dc4ff382d6a0c0d8e4ca",
         [
          null,
          {
@@ -467098,7 +467271,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "26f22c20aa8087fb65f498f3b81fc08ede5a7889",
+        "76ea76b0e79551978fa0c32d73c6b02bcb9924a1",
         [
          null,
          {
@@ -467107,7 +467280,7 @@
         ]
        ],
        "fetch.http.html": [
-        "16aa4622f7ec34ab0436aca2ab73b0b4edf82409",
+        "ca748f8bf49d4a24d1fc1128dbed1a5dbdd308bb",
         [
          null,
          {
@@ -467116,7 +467289,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "33ae3a6d9ffca06b2488d64c380d46c62fac0f09",
+        "cdd79cbd59b82d53cb3a2f43d5aeb4218beb2a6f",
         [
          null,
          {
@@ -467125,7 +467298,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "fd9a9b77d6c26ce89e41423f8eaefdb4479e33e6",
+        "48144e44ee3ab079e9d0d5ca472050fe48e53a3f",
         [
          null,
          {
@@ -467134,7 +467307,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "6c800ae84fcf03079c9c9086e921867b4e82cb50",
+        "6d5e38a7504dcdd4741d651539bd4c4c11c51a25",
         [
          null,
          {
@@ -467179,7 +467352,7 @@
         ]
        ],
        "xhr.http.html": [
-        "4c2906171258cc87eb6f4b8242e148314839ec04",
+        "334e848af1bc221ec2ba4e2bf6195adbf4749519",
         [
          null,
          {
@@ -467190,7 +467363,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "b26e871cc083e8a774df4de7eaccb2e0a2819559",
+        "e634c212636891209cb5d8a4c151dce135430c78",
         [
          null,
          {
@@ -467199,7 +467372,7 @@
         ]
        ],
        "fetch.http.html": [
-        "8519c7a9e6838ab74ff0a6d6d675603f2e07266d",
+        "6668438f86a73f64ae342964cf6b65366489bf4c",
         [
          null,
          {
@@ -467208,7 +467381,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "2003546a5bdc75fe1253383c87a3f0d4955488c3",
+        "4998ebf7ead1685555e417c44a7f964985baaa10",
         [
          null,
          {
@@ -467217,7 +467390,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "e00f2f9ad78ad9eb890d2c7ff78601338b2dd269",
+        "7a71b188a02bfcf3727ad8a8a0683f17c3e4abbf",
         [
          null,
          {
@@ -467226,7 +467399,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "255e74227238d0d4494e8f17988f548e3df24dd9",
+        "badee807f059b1ae619d16b7124c1602a5616b10",
         [
          null,
          {
@@ -467235,7 +467408,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "624a06084f5a858873ac99e17a8e9b612cfe7af0",
+        "977e4a19eaf86a65e0ee9642a86d1c8e5ebffac4",
         [
          null,
          {
@@ -467244,7 +467417,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "f89575f609ce332300ea7ef756444fd8a2646119",
+        "27a27d9ee4acf7d02923a06d29f2beb1a92a52b5",
         [
          null,
          {
@@ -467262,7 +467435,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "c8d425ad82fb5ea8a03ed2707515d408b565af26",
+        "d3375bae69882018f93293e13b4439a22fb860be",
         [
          null,
          {
@@ -467271,7 +467444,7 @@
         ]
        ],
        "xhr.http.html": [
-        "5e4f133682bf6d7ecba6d1f7b8e703facf3993f1",
+        "1b0c6bf4b314bd922a039e023f2be8c851e69bea",
         [
          null,
          {
@@ -467282,7 +467455,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "574101790d36fa4c731532309585902cdc3d197d",
+        "3ce62bd49a4794f32c87e4adce53dcb69ea0cf43",
         [
          null,
          {
@@ -467291,7 +467464,7 @@
         ]
        ],
        "fetch.http.html": [
-        "fa7ee7390c75ddba40dad2f8056ccc046ce4ff9f",
+        "1e6e9780bb8eef8d997cfab95c10ce02adbbe068",
         [
          null,
          {
@@ -467300,7 +467473,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "9627686f2bf58ec6af6803be03c65656f16edf84",
+        "6ac87080fa7c518ee17000fe1cb02b12903b67e3",
         [
          null,
          {
@@ -467309,7 +467482,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "52e9ba01c707e462e8bc7bb66826deb3fab1881c",
+        "d416b44f415c635955facdf29b71d7a2f7a0ea39",
         [
          null,
          {
@@ -467318,7 +467491,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "f1d7c53097f6ce0c7813bfbd465744237eb92cb8",
+        "efc3de1b0aa440e438d4152d482e4e48794d128a",
         [
          null,
          {
@@ -467345,7 +467518,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "1821b6c5d378548109fbb5626d42c80de746deb2",
+        "45bd4d30e3306d1648348235eea4429452d124b4",
         [
          null,
          {
@@ -467354,7 +467527,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "22720ba80dd134684fa3c1b1658976d29db59f7d",
+        "692e6b8bb2be15a4bab59158dbb9fa8eead6e138",
         [
          null,
          {
@@ -467363,7 +467536,7 @@
         ]
        ],
        "xhr.http.html": [
-        "7beea7de3d1a7d90fb47a4d4492af4afaf1774fb",
+        "73fe9dede9cf80295a2cbcb465660577997551e3",
         [
          null,
          {
@@ -467374,7 +467547,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "60d501b076ed558540622799cadbd82b819e32c8",
+        "34a7a49e7cc8ef776d70e6f614ac8935231c879f",
         [
          null,
          {
@@ -467383,7 +467556,7 @@
         ]
        ],
        "fetch.http.html": [
-        "b8dd496d41b25ddc1002966af81202ef222a93ce",
+        "21cd62f1e89bee274ac51d666c8354167a854e39",
         [
          null,
          {
@@ -467392,7 +467565,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "e184b5fc577b51c007179708a31534e1202a086a",
+        "8ba4ffabf0d96f70b2d39fd621298ece4e217eba",
         [
          null,
          {
@@ -467401,7 +467574,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "8f365607e44d6dd8927bd9547036bbefde549895",
+        "092fd4fc4d8a1bd59104c790531ee954eb1650b3",
         [
          null,
          {
@@ -467410,7 +467583,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "cbe698f1a404e666bb1f7c06f2d79359119fb113",
+        "4d50b3b90cdec89b5acd9a6c0e4315930f268d87",
         [
          null,
          {
@@ -467419,7 +467592,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "6af97817cdfc2f3f0b93de31f88d5344f78dbcdf",
+        "952dc99dd214ccf193a9717ac3af04bf28ba5af2",
         [
          null,
          {
@@ -467428,7 +467601,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "d8488b63438bd281349f769cce949f8c785f92dd",
+        "6712399a63aaa94e92eb9178402091b47a6bffa7",
         [
          null,
          {
@@ -467437,7 +467610,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "827f90ab2a78456892c2c51a42bf01689cc431bc",
+        "4bc603169988e192f06f8b8af9f770acd49c8ea3",
         [
          null,
          {
@@ -467446,7 +467619,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "fdf1cca6fc4352a08cf3e3393da7068e46a1ea40",
+        "05f15a98e9796bd1c260851d7a37cf8c615563e0",
         [
          null,
          {
@@ -467455,7 +467628,7 @@
         ]
        ],
        "xhr.http.html": [
-        "4263178d54b49e16159dfe25f619a08d916e2977",
+        "1d289252297a0a269a28df1d15f9d42142bce6c4",
         [
          null,
          {
@@ -467475,7 +467648,7 @@
         ]
        ],
        "fetch.http.html": [
-        "a07740d0584d94516474bb51ca6fa312759df693",
+        "d87289b3931bae830179ede55b1458b8d05d6eec",
         [
          null,
          {
@@ -467484,7 +467657,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "ec71b7b9dff7f1e6e3178d4cf05f36b8f012f3e6",
+        "5f76c249747efbd688d9641bbecd9d6f0b22e39c",
         [
          null,
          {
@@ -467493,7 +467666,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "121e645b8e2ea704098dc345cf21e88c6ac12b6f",
+        "8c95386af49bdf0ee7d209caccb3448029b8ee79",
         [
          null,
          {
@@ -467502,7 +467675,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "7dc852f7d63845cf6e8c95fa54fcc54d43d709d4",
+        "cdfdb24d35870830c6235ab8107576d35eb35810",
         [
          null,
          {
@@ -467529,7 +467702,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "c4d74a5294e8991f4bbd71b75bb2224c39bd913f",
+        "0c1df2d02199e3a5aa0c9adc88255b19198281ff",
         [
          null,
          {
@@ -467547,7 +467720,7 @@
         ]
        ],
        "xhr.http.html": [
-        "5d73f4b7d0ebd8614b94491b4a22bdd69eb94eab",
+        "beb2a4fc38b4b9204985110c814094391dc84a94",
         [
          null,
          {
@@ -467560,7 +467733,7 @@
      "iframe.meta": {
       "no-referrer": {
        "a-tag.http.html": [
-        "30143c5b21877eea3b8a40772a9cfde7575de223",
+        "83efe8b9b0cf5911c5cf9d70ab650c6b665c4574",
         [
          null,
          {
@@ -467569,7 +467742,7 @@
         ]
        ],
        "fetch.http.html": [
-        "17ccb121c7c93a17306a327363f6c201464d2047",
+        "b01056da7d6a6f4a7d447e4ddc73f1fde19d90fe",
         [
          null,
          {
@@ -467578,7 +467751,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "79ad63d9cf631df6dc0b50b55ca8468b0416dcef",
+        "15a8b4b7dee956602401578ac0877641851dd9dd",
         [
          null,
          {
@@ -467587,7 +467760,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "760f15154144f4b5bdc543f13a29c96388ec8381",
+        "16682a9983baae996bb7230f97f5d6c0bc528798",
         [
          null,
          {
@@ -467596,7 +467769,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "b80f4d5acad475e58cd65107a077a364aa5ef798",
+        "41d4e9053d2131781cab82c06924867cd63798cb",
         [
          null,
          {
@@ -467605,7 +467778,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "807bdfc13b2b151eb411bb174386cedf1e7a904e",
+        "00f15c8eed663c6619b40053a9fedb98d5964c8d",
         [
          null,
          {
@@ -467623,7 +467796,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "384ffc879ff04f085c155e7b9dcb9bbb7662128c",
+        "6cb42b49b0b06342ab42b31daa53da0d2cefe8fc",
         [
          null,
          {
@@ -467632,7 +467805,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "031b1c8de41054ddc48370c3ac025a6c7997bba7",
+        "660e8a16e7d71f89280aea849c31ade5155ed8f0",
         [
          null,
          {
@@ -467641,7 +467814,7 @@
         ]
        ],
        "xhr.http.html": [
-        "fbdfe7ab59ff0c2ae40d2ecc1062bf4b10e56412",
+        "208e7ad99d4d9221af2d4e258da02abcbb30da1e",
         [
          null,
          {
@@ -467661,7 +467834,7 @@
         ]
        ],
        "fetch.http.html": [
-        "f082ff6a5da4f163a3f1defc41352ae196b43b9c",
+        "de12bcc32766fb1eec3356e35077e2b27096d7f9",
         [
          null,
          {
@@ -467670,7 +467843,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "e3401876e0e3bf23739f55174bab5590179aec24",
+        "b82b165181ada6e20480b9c3bd458e203bf372b3",
         [
          null,
          {
@@ -467679,7 +467852,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "d915b31d2e7aa3bc88c3f49ec9174869c0ad00f0",
+        "03a3970ab4e47974f6bb4eafc85cc3c05f2c77bc",
         [
          null,
          {
@@ -467688,7 +467861,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "3963bf9cce6292485d3c318e8c663e67e12fcb25",
+        "361634ca575930b4b62bad2e2ec9623fe8ec95da",
         [
          null,
          {
@@ -467697,7 +467870,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "e1afc25e7d2ce4616ae679bed9044f65b76d962f",
+        "58f7b9b3c216c2e5c22fa4b684824d8766b1bc29",
         [
          null,
          {
@@ -467706,7 +467879,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "856896a6fdc963f7474e9aa288888bb5959d9673",
+        "3c2d1e1567822431eb5256f52166de0292ba9ed3",
         [
          null,
          {
@@ -467715,7 +467888,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "d70fd369ef126077fe51922ee2240ca6a237d9b7",
+        "b60df9f303abb13676918ebb1e08aed578f7af68",
         [
          null,
          {
@@ -467733,7 +467906,7 @@
         ]
        ],
        "xhr.http.html": [
-        "5e4a629ca85df91937f59b3f3714f54f3df0149e",
+        "7abc3bd60969ef9ebe4f6dc4869cf89e6b2ec5e3",
         [
          null,
          {
@@ -467744,7 +467917,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "99708dc1f9cf4ef2a0699c0c5df879d50591ae1d",
+        "99292987da7e091699619cd0cf31bd776a50a092",
         [
          null,
          {
@@ -467753,7 +467926,7 @@
         ]
        ],
        "fetch.http.html": [
-        "4c97df8cd506c941b765b0e33bca8ecbec1dd0fd",
+        "8c3ad1c4dc5062133b88b783e833829b05275592",
         [
          null,
          {
@@ -467762,7 +467935,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "60fd12914495c835b9e20ab726922050f0ce676c",
+        "7a7c98741d3b697ef146f9aba62637365da19691",
         [
          null,
          {
@@ -467771,7 +467944,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "d6a9a5b8cbd2195ee6dd12a0a755dcbfc8985999",
+        "98f20d3a78ef32423501db996e77e06d6965f69a",
         [
          null,
          {
@@ -467780,7 +467953,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "4d67b4713206cd72907b2dd5280cc1e9f4ce1c6e",
+        "ab3300de52b23cfdd4b54157302734a4e6e8150e",
         [
          null,
          {
@@ -467789,7 +467962,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "cb448cd71e48b7cf00e9bcb012bb2dc5def1acc1",
+        "23af1ff3d5e1ec0569ccc17b02524996a28aae0d",
         [
          null,
          {
@@ -467798,7 +467971,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "61a4363e94ab62c8f6268296484f1811fa66092d",
+        "b72a27919d8fde3d4b8d06ccb6bb48ced4f0a7e0",
         [
          null,
          {
@@ -467807,7 +467980,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "20119fc6c1b9228b9eb2b31528efacd6cbe60001",
+        "e36e58bc24e3f3254f6a2ae49baab54e7d664a55",
         [
          null,
          {
@@ -467816,7 +467989,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "edc9aae52354655ff06cea9549caf255a79655e1",
+        "f2a5f96fb687ae203ad973cc8107af8aba266aea",
         [
          null,
          {
@@ -467825,7 +467998,7 @@
         ]
        ],
        "xhr.http.html": [
-        "05cc5e3e39b616b5aabcbf0c38f637faa8f67707",
+        "90a80b28819169df8ad95def8b79819cdf59974b",
         [
          null,
          {
@@ -467836,7 +468009,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "6a1843ba360627bb968f9c6fef8b6b5bff03bf35",
+        "dd356554cb15fc6d2ae7d075ab2148d807a090a1",
         [
          null,
          {
@@ -467845,7 +468018,7 @@
         ]
        ],
        "fetch.http.html": [
-        "c8de87a45e4231be125196ea45ec4d4e13229b73",
+        "4b0cb139c30e6928ca72950bc3395be87d08bdb2",
         [
          null,
          {
@@ -467854,7 +468027,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "0fff6c8a144bf65b91a7cf95677f07e2a3df5a02",
+        "3ca1acfeec62d4b96030ae81847141ba6e8f5372",
         [
          null,
          {
@@ -467863,7 +468036,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "e2d58a9482454086b46fb55ee08cf72e39f63bea",
+        "c74568d077e6db41775d347e584d7b087ad2b4d2",
         [
          null,
          {
@@ -467872,7 +468045,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "17155062ae5077b35df7fbc9e3a540b9acaef719",
+        "ff4c200ec64469fff2c8bd5b15755b027f4f8130",
         [
          null,
          {
@@ -467881,7 +468054,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "573fa06eada2830d415a286ef8d3c8d497182db3",
+        "d04fc6b202208ecb5142fd60975cca603c338c6f",
         [
          null,
          {
@@ -467890,7 +468063,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "11d099211218899ed790b3617731208f93f96362",
+        "61ff8706362090329cc59a69a92de652078b0f55",
         [
          null,
          {
@@ -467899,7 +468072,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "f403027fd6f5d9b07c2cae302e3741e5bff48901",
+        "e16183db00f6aad49efce3f1666f428a17918fb5",
         [
          null,
          {
@@ -467908,7 +468081,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "edd3cdcc49fb05bcf31145a10b02c29d538b56b0",
+        "3f1d5cea469a91c813e523462c77c34f6034642b",
         [
          null,
          {
@@ -467917,7 +468090,7 @@
         ]
        ],
        "xhr.http.html": [
-        "c9d75ec031fb158a13459de75fc78a1bd3c47fc6",
+        "2e8f1d3f3a8d5b4d9b584b74fd168608c80e98c6",
         [
          null,
          {
@@ -467928,7 +468101,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "bb5518d632f2e8bc67cc4d02c42b9219ef44ed06",
+        "2c8788a3fc1d970ac0f5b705f25bb77684e8cd82",
         [
          null,
          {
@@ -467937,7 +468110,7 @@
         ]
        ],
        "fetch.http.html": [
-        "3243b7407ee9948b3e765cae901cd3de748f6caa",
+        "4a9d042b77944fa5fa8d66c972e567f07052d4a5",
         [
          null,
          {
@@ -467946,7 +468119,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "f1e973f749100df734d04b7dbfbbc4edf9c69091",
+        "fe9ed89b2c92021a6520a5ad2a8ee3e8047b9b58",
         [
          null,
          {
@@ -467955,7 +468128,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "3a24fb18963654cb0f42eb63dae63710ede3b607",
+        "33a45c682d0013f1ab45d582e736b96539c54683",
         [
          null,
          {
@@ -467964,7 +468137,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "75c20a0b9e1b7363dd3a36f3cd94adf22d8dc5e4",
+        "a5d467eb5d1aaa84dc5e61da50d465d0d8e9d602",
         [
          null,
          {
@@ -467973,7 +468146,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "4132b4f24d642cd3dcd1a749826dbeefdae449ae",
+        "13b2be2c3207b6e1431d66673ff1dab4ae49d61c",
         [
          null,
          {
@@ -467982,7 +468155,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "e9455bc50f2b802985e942662ea8ff8967ad06da",
+        "70808bf035ceec682c315dec782d36de66a78bac",
         [
          null,
          {
@@ -467991,7 +468164,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "536764e13478f3de8b5ffce2756fde350612e154",
+        "35300e13bf6c07d46ba9627ee247364ee7e3261c",
         [
          null,
          {
@@ -468000,7 +468173,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "e03f3a8c18f9d8fd56234bd6bc4f81ba86e2bbbf",
+        "5540c723422295d7d3c688b3b34279f7b94ad77e",
         [
          null,
          {
@@ -468009,7 +468182,7 @@
         ]
        ],
        "xhr.http.html": [
-        "0a9826018875d24e41b2e982862cb95c9850485f",
+        "d88fe6fe615fafd8a66f2211b24a14d6aec780b1",
         [
          null,
          {
@@ -468020,7 +468193,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "0d41e9a33beb5594e31a56a89c6d5aca5e2a7560",
+        "6326dd1565169a670eb834598c6059850dbbe574",
         [
          null,
          {
@@ -468029,7 +468202,7 @@
         ]
        ],
        "fetch.http.html": [
-        "4d5eb2ef77b3ecc9f8dea3e54e99ee62afb78e8d",
+        "10cddc13cd8cd041afd7059249c0db47de201a59",
         [
          null,
          {
@@ -468038,7 +468211,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "e70240b48d4aff91c6f4d27c0f8d3bff6afd099a",
+        "1944b34e6853823c72989ce75be47b09cc3d251c",
         [
          null,
          {
@@ -468047,7 +468220,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "9bee056a6cc98908035207c389aa5b37365913a4",
+        "36386aa711caa533d06e7c0f5949f964759c49e4",
         [
          null,
          {
@@ -468056,7 +468229,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "2700ce04e2a5a1209d35657af5d992cb6c67fca3",
+        "55eac6bd2b46c45598001ac27ddd9497cdc9af6a",
         [
          null,
          {
@@ -468065,7 +468238,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "b932294d3c7ab373c185c15c403eae4e81e0b870",
+        "4ffaff067a3ec00f8fe341b351c2a7af701f5e4a",
         [
          null,
          {
@@ -468101,7 +468274,7 @@
         ]
        ],
        "xhr.http.html": [
-        "1cbf07354cb5f76cf8d417a9ed262f4f35c175d2",
+        "a03df3fece24fb563cb8dcf9fcc8c896a79b9688",
         [
          null,
          {
@@ -468112,7 +468285,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "344b0f4c8a03f23b28bbf2a6f3040c508859bbed",
+        "f182ffb3fb110c8628e541dfdbc49dee84ee5452",
         [
          null,
          {
@@ -468121,7 +468294,7 @@
         ]
        ],
        "fetch.http.html": [
-        "9e0e46f3fbb982b4050e0579d94b38b36ba38b33",
+        "79460c78c0b5db82a1c4b9cb6e33a9d06866c414",
         [
          null,
          {
@@ -468130,7 +468303,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "ab20737aa2c64d535b9395211abeacb947aa83cf",
+        "2e09d681d068912dc8f50c04ba51b30094068966",
         [
          null,
          {
@@ -468139,7 +468312,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "e1149db53a46d032029dff6e10f70cb6d0983185",
+        "b670dc7fe60ac6fc69d4d3bf45a6d44a9580f335",
         [
          null,
          {
@@ -468148,7 +468321,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "5c19ed692909bb0cd5153eb057aab348b612d47a",
+        "38bc675beb272071e210e828aa64fb389094c3d2",
         [
          null,
          {
@@ -468157,7 +468330,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "7d403ba7ba521747692928c9fb9db388f10cff65",
+        "23a47107eac8ff358ac4127bcf197d577d0230c0",
         [
          null,
          {
@@ -468166,7 +468339,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "c0e4b578667e75f2c4bda68a1f58e1b62e33b01f",
+        "74d3ce8426aa78aabf31387eb50d140f3d6ddb84",
         [
          null,
          {
@@ -468175,7 +468348,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "b2fc79339ed0ab6cc829740565c47822a33c776d",
+        "6d3c2a56c047730343f5e3e8911d190dd99604c3",
         [
          null,
          {
@@ -468193,7 +468366,7 @@
         ]
        ],
        "xhr.http.html": [
-        "fb78eafbf6d0f952c5c988055fad567d903a9b8f",
+        "1a79ce37b0704b5e7a24c5ab7dfb8a6c8ed52550",
         [
          null,
          {
@@ -468204,7 +468377,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "458367b475c2667903ec57794e5e74c2bccbc820",
+        "64cec3d0cf0194e32b1c16a9db6a15d4fd6b836d",
         [
          null,
          {
@@ -468213,7 +468386,7 @@
         ]
        ],
        "fetch.http.html": [
-        "e848091af45b7ab39088448112ff964513ba5163",
+        "084ed268e1c42b9c452ed46c3e29d134d0d04abd",
         [
          null,
          {
@@ -468222,7 +468395,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "84c76ac6852ab704f47b2f9766f15748a4b59c1c",
+        "a4d49315e5416f7bc4fe1ada0bf2c4e23d002fb9",
         [
          null,
          {
@@ -468231,7 +468404,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "c390d8cee5e1818ebb4eb5d91d9335d67d41e51d",
+        "b318a37f906be803a32a100ac5b23f928a567459",
         [
          null,
          {
@@ -468240,7 +468413,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "8072c4f71d3b31625d6bba709c867a2b32df8e69",
+        "90ace4d25e92d0146ed5f14485d26db7b58c98d3",
         [
          null,
          {
@@ -468258,7 +468431,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "37a75dddb51f19e70a3fc77adfa47ddd640da305",
+        "d66916330cd65a9b0f628c2dd1b0da622a965483",
         [
          null,
          {
@@ -468276,7 +468449,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "7a236950362e7dc44f0da4ba150f69bb04777e6f",
+        "811b0f2c3f475b26fe3dc6c26b04edcc7f3a75ae",
         [
          null,
          {
@@ -468285,7 +468458,7 @@
         ]
        ],
        "xhr.http.html": [
-        "c57fea3be9d6a5465db8519bd3ec2ce25b1934b3",
+        "4e367197fd8841acfc5f61722db1afca4feb89fd",
         [
          null,
          {
@@ -468296,7 +468469,7 @@
       },
       "unset": {
        "a-tag.http.html": [
-        "98a6a066b72b4147a2d76c488543cff69887c30c",
+        "e50b1f64a8a8eb81148018f3bf8a77ae9b62742a",
         [
          null,
          {
@@ -468305,7 +468478,7 @@
         ]
        ],
        "fetch.http.html": [
-        "4a405af0ef003ac8b787fe4ac58b51e9c0af2106",
+        "d87289b3931bae830179ede55b1458b8d05d6eec",
         [
          null,
          {
@@ -468314,7 +468487,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "13af0c8ba6a605dc9d6afcd1f504756e0311f2c7",
+        "5f76c249747efbd688d9641bbecd9d6f0b22e39c",
         [
          null,
          {
@@ -468323,7 +468496,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "ab43d92743202604a301a90edf3be85fb973a514",
+        "8c95386af49bdf0ee7d209caccb3448029b8ee79",
         [
          null,
          {
@@ -468332,7 +468505,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "9ce14f67474dd03aa317ffa13c01e1a770983183",
+        "cdfdb24d35870830c6235ab8107576d35eb35810",
         [
          null,
          {
@@ -468341,7 +468514,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "6199ad9a3301da4afb223e4f526a86978a360ae3",
+        "cdc6ac163cc3713ba3832d5aaf38a9de97b2eaca",
         [
          null,
          {
@@ -468350,7 +468523,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "e72944e9a14c92b9f7cb8f9b054b1b4dc512f8e1",
+        "9e5b4b2b17ef59336488f32d5789374e9e6f817d",
         [
          null,
          {
@@ -468359,7 +468532,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "c4d74a5294e8991f4bbd71b75bb2224c39bd913f",
+        "0c1df2d02199e3a5aa0c9adc88255b19198281ff",
         [
          null,
          {
@@ -468368,7 +468541,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "9c372ad1bf194c6b47ab35955b70ac7139584049",
+        "65e86f94ecf2b29384489968094e033f3998cd33",
         [
          null,
          {
@@ -468377,7 +468550,7 @@
         ]
        ],
        "xhr.http.html": [
-        "86a70979468e65ee30f059863b596bab3da80c58",
+        "beb2a4fc38b4b9204985110c814094391dc84a94",
         [
          null,
          {
@@ -468390,7 +468563,7 @@
      "req.attr": {
       "no-referrer": {
        "a-tag.http.html": [
-        "3b876773fb2441fa67c52ac9b39ed96fc50317be",
+        "ab7cd57f3d0e9e5fd6ddee09452f2714454a4460",
         [
          null,
          {
@@ -468399,7 +468572,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "709707c6e7ab0600609a4ff6f5bac508601d7ed8",
+        "e9dfa7da6d1a4b7c2c1dc333e2a07a6ea427ac0f",
         [
          null,
          {
@@ -468408,7 +468581,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "c28cdcef87bc498ef72a19bdb6299b83833cd805",
+        "61fecbcb0b04f05a4fe5a172dccad7acf415e16f",
         [
          null,
          {
@@ -468417,7 +468590,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "c7c6bf629e93c66943038aa9961d3ee371f5493b",
+        "1e23802ced007764223c692973b8ffad92450960",
         [
          null,
          {
@@ -468428,7 +468601,7 @@
       },
       "no-referrer-when-downgrade": {
        "a-tag.http.html": [
-        "d00e69add72cbf09afb89e9ca5339afd9b8a5bcf",
+        "ae91f3ec28e8075a170a063b7149f474c97c6e13",
         [
          null,
          {
@@ -468437,7 +468610,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "467b6fd3336af59d9e6683a8a6de2541f7d2820f",
+        "8e403aecac94bcf456178308c18bfb49134a1c37",
         [
          null,
          {
@@ -468446,7 +468619,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "20d96396934ac277f71e7521174976c97be04f37",
+        "d5bb8f0ef3434524c406dbd2395ffc34c8e67e7e",
         [
          null,
          {
@@ -468455,7 +468628,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "5f4b5b5fa40ebacdde64a4f92daf5d8dde11c443",
+        "c70743a04e3fc4ebe9401956dbc7e5d5eee2f4fa",
         [
          null,
          {
@@ -468466,7 +468639,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "beef14fa66ceaf67ead422fbc029464c57328871",
+        "64483ee7bdaeb676df1fd19aac460540fe503192",
         [
          null,
          {
@@ -468475,7 +468648,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "ff1829b9876289d03d401dfe6d2bb814a0ef274a",
+        "c573d1841daf3c4c61bfb6e9c5abcdaed8b7b1d9",
         [
          null,
          {
@@ -468484,7 +468657,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2e50298cb68f1505a2e9b18b48a3c482182f20d4",
+        "eff9cafda0aa9efecced977efc112093dfc341a6",
         [
          null,
          {
@@ -468493,7 +468666,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "41967e94cf27001a3f476681c5af5e772fc42af1",
+        "e5743a567e4723bd59768bd8e9f4790953b9520e",
         [
          null,
          {
@@ -468504,7 +468677,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "60ab249521c1bf1c8a8c72be14fadd05d22db84a",
+        "3a027ff7d6c12a9883670475efbbc20e2074da99",
         [
          null,
          {
@@ -468513,7 +468686,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "0c0976c4e9c2dbd32daadc881cae7f096d7f5287",
+        "9ea1f00476bf1037957accbc502d82651ac08b85",
         [
          null,
          {
@@ -468522,7 +468695,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2e477d881571a934d91d879ff84707bd4f72f23b",
+        "b43f8ee0b74b18c0ffda3119ca9e603162762826",
         [
          null,
          {
@@ -468531,7 +468704,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "37f30ca92894d9c18e00d572922a2a42a7fdad78",
+        "ec677b6a5537a2619d7a58a976882fe12e117f6b",
         [
          null,
          {
@@ -468542,7 +468715,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "cd7ffc348c0e117f4dc0e5dbab968ea9631747ba",
+        "e3f37212efbfe27022b15b941cf9a15659af33d6",
         [
          null,
          {
@@ -468551,7 +468724,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "31fbe765a1a98dc15798846124a467c72a60adfe",
+        "0ae0c0777567e828ea6ffecb941a8c2a8c7888b9",
         [
          null,
          {
@@ -468560,7 +468733,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "0b60d1df47de8c24150c59b47806381bf5e3bd33",
+        "f2b40fb5428beceb61a0246d9ae0997c43473280",
         [
          null,
          {
@@ -468569,7 +468742,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "f5324baddfd217520083f5519cb0acf1ec8e3a85",
+        "fa17836a614272497fb062922f1748a796b86c73",
         [
          null,
          {
@@ -468580,7 +468753,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "c9e3865b45362d1bad301944c633c3c6a939ec26",
+        "c1f732a3e53dcf78fcc0bb8cc0e04708a746c756",
         [
          null,
          {
@@ -468589,7 +468762,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "1bff8c146a9f7be807fe2397063b2f92d0ae3746",
+        "91d9eea523d52612b97ba18aca2ff914cdeabd2b",
         [
          null,
          {
@@ -468598,7 +468771,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "c2b990d117700b7bb80cbfd6a445aa97c839cf43",
+        "800fb23943b5200db52d11b0290e06cb2e6c9dd8",
         [
          null,
          {
@@ -468607,7 +468780,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "8da013a20d5f86488403eaf6a098d5ea943ab785",
+        "4337612c3b7b4bf86f15746881fd78d594b8c122",
         [
          null,
          {
@@ -468618,7 +468791,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "268108ea95527f860e1bbcce4425193da700462a",
+        "ffd3f95fe2d1f39e36877978dc7054c55e320fc6",
         [
          null,
          {
@@ -468627,7 +468800,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "6fd331a42f16c8a3b68b13e34cf941ca349494e9",
+        "111205e1579400518983b5fa8f9b369cb88e1928",
         [
          null,
          {
@@ -468636,7 +468809,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "8874ca657bf48b4acc56e16c69e5fee2b0d83052",
+        "3d45b4e7a1a789889f7d0cd8c4fdeaa4a1815f3a",
         [
          null,
          {
@@ -468645,7 +468818,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "20c192e560d463ee49057be9ded576d9d42eb28c",
+        "44c9a7d89720722b061584c41dcaf6f5b69491ef",
         [
          null,
          {
@@ -468656,7 +468829,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "c578b90e357f01136965022e3c6ca5be28e17439",
+        "04e590c37e5e3ab2f5eb01873be49114e8fd6b35",
         [
          null,
          {
@@ -468665,7 +468838,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "37daa670d1ee9ce79970c340da54c166f37bcd20",
+        "4c2a09f18a533ab1262102a9a964aa96d328950c",
         [
          null,
          {
@@ -468674,7 +468847,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "65c363e7d6b927649af8f7038228018afbf36c4a",
+        "b1053ab0e26c1a561e86daccc275747219e14126",
         [
          null,
          {
@@ -468683,7 +468856,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "21f58903f21a907bcc79c3b4470e282840d8ed4f",
+        "51b0db7d1af08ce5ade6f0936441147b97b45bdb",
         [
          null,
          {
@@ -468696,7 +468869,7 @@
      "req.rel-noref": {
       "no-referrer": {
        "a-tag.http.html": [
-        "39a73f3f21a7c9e3b7d5b7e5c18090c2417edad9",
+        "0205df0cdef23f5e2413aa8be7a2576af1451d4f",
         [
          null,
          {
@@ -468709,7 +468882,7 @@
      "srcdoc-inherit.http-rp": {
       "no-referrer": {
        "a-tag.http.html": [
-        "2ab75e2b4efdf315c32b17a277ada7e864479ab3",
+        "f9fada238b82570aa40d03fdfc13045ea4476bf4",
         [
          null,
          {
@@ -468718,7 +468891,7 @@
         ]
        ],
        "fetch.http.html": [
-        "a885d7315cad698c9f8d277827cc956b83d95c83",
+        "8bc2cf3b064e1a66940e20ffaaffc914fa239a5d",
         [
          null,
          {
@@ -468727,7 +468900,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "aecda128ebe70fcbb6442892d4511a00f87cc4fc",
+        "555121b53303a180f6fb721d7a2213508f60480b",
         [
          null,
          {
@@ -468736,7 +468909,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "bc6270820d59f5ccac2d6929906e67dd932a73c5",
+        "8fe04405cec90757f55d64ca0ac2c40190f6f31e",
         [
          null,
          {
@@ -468745,7 +468918,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "6ea115a3d6e79f32bac8e177bc3830e8faf9dfbe",
+        "08bc8089647bc43f6248f2a90fe44f1ec22e4f64",
         [
          null,
          {
@@ -468781,7 +468954,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "a91c5aad664d1c83eac6d43a2bbaeba1982a4082",
+        "05f26609235f879da4c24b9d48c9c3fa78c016d4",
         [
          null,
          {
@@ -468790,7 +468963,7 @@
         ]
        ],
        "xhr.http.html": [
-        "fdbe13ed48a0c91103ba7af71dad4987e67fc6d6",
+        "529b7646c85e897ef71baae37138063d8bd58efb",
         [
          null,
          {
@@ -468801,7 +468974,7 @@
       },
       "no-referrer-when-downgrade": {
        "a-tag.http.html": [
-        "1189ee736e6b1f126916c0424847ed8f48a0ae1c",
+        "c00ba92de5c6e36984862ad0b5a182ff98dc3d0e",
         [
          null,
          {
@@ -468810,7 +468983,7 @@
         ]
        ],
        "fetch.http.html": [
-        "7a496dcc90c90ac3e4a8171409895c52062eccf8",
+        "ed3bc61f01861c675907bbda28afc1e2e0aee24c",
         [
          null,
          {
@@ -468819,7 +468992,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "44be5e09207b31e6677c6e15ed643d36a747712c",
+        "a4fb7d8629b47146ed541ab93d3f2cb7761eaee1",
         [
          null,
          {
@@ -468828,7 +469001,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "39ea7aca89e533f52c57b12cdb9b08e031a6712e",
+        "948089af7e88852d479077fc6cac2ca6aa60f763",
         [
          null,
          {
@@ -468837,7 +469010,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "7688f6011548cd394ae10955136a94939daf7cf3",
+        "5d152c996afe5a398e751d2c69867a393df120ef",
         [
          null,
          {
@@ -468846,7 +469019,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "a843e75fd25d7e2076285ab1fd03cce0984bca39",
+        "de1c533bfc83394acb6b52de86b23da31429d462",
         [
          null,
          {
@@ -468855,7 +469028,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "27e4d4495a3480e60cf4aa5d6a49fb248cc2c1d7",
+        "c088ac04d7f3359b4146dd8e73c1227871e6f4c3",
         [
          null,
          {
@@ -468864,7 +469037,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "708909e4856256d8419719a8428712479e6e56e8",
+        "8433c4d9df9afdf0992b5e879346edd24c2ee910",
         [
          null,
          {
@@ -468882,7 +469055,7 @@
         ]
        ],
        "xhr.http.html": [
-        "54d5403ce0c527c3de6a9f729a77ae8b30fc8e1f",
+        "20d3eb1ff827a4b3916b756529ded620418fbe32",
         [
          null,
          {
@@ -468893,7 +469066,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "d9578a64cb83a17a6f62b4b8e96ec84a38e70d32",
+        "5f24860f1752ea9482158111f839085315e21081",
         [
          null,
          {
@@ -468902,7 +469075,7 @@
         ]
        ],
        "fetch.http.html": [
-        "0bdf7d22e9791ad7f9dc91faf00cbfe396dba3b0",
+        "75e1bac179008804ae1b309a65cd7c4a850583be",
         [
          null,
          {
@@ -468911,7 +469084,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "ddfcbe6e9e081c69a30fdb04ed97e19f59b8bf12",
+        "8e40188f6c96725f23f92ccf410c59c489e957ea",
         [
          null,
          {
@@ -468920,7 +469093,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "d389be343479edf606745c9117eb0f9de17b545a",
+        "21013c61e48edb361662cd0231005c255edf4a71",
         [
          null,
          {
@@ -468929,7 +469102,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "83c6927244891d21ea8d4d6c978d6b83db83c37d",
+        "3e542dbb59a79efd10d6a95c8c82a0488cbab1f6",
         [
          null,
          {
@@ -468947,7 +469120,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "5749ed2e610d03d3d1955238e8aef88f3ae4059e",
+        "5bd7631966481dbc4b146802f3d8ea219756cf88",
         [
          null,
          {
@@ -468956,7 +469129,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "69ad2476abfaf4eeb4b654019610ab525882a0b6",
+        "3a901d4df9a4740e14c7c36c57eeb88366764c66",
         [
          null,
          {
@@ -468974,7 +469147,7 @@
         ]
        ],
        "xhr.http.html": [
-        "5303f20172aa40b0cbf0f741f98d7806ab5e74f9",
+        "0e691f80797f333946fa11e43a7aee8c13f72292",
         [
          null,
          {
@@ -468985,7 +469158,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "d7d69dd01489c63072650f0121dccd01996b8874",
+        "6ed5f3bb75a70f3c50d561e2754be668e759b3dd",
         [
          null,
          {
@@ -468994,7 +469167,7 @@
         ]
        ],
        "fetch.http.html": [
-        "db9eaac047f0789325e9ab89848085afb1a8c3eb",
+        "6ce6800ed1b9b115568b2b82d8441dc8a155bc8e",
         [
          null,
          {
@@ -469003,7 +469176,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "06fbcb50a4747b8d66e4a782c4db2f804d593885",
+        "6a0c5286868a995f734ccf858dad0fb9ecfbee8b",
         [
          null,
          {
@@ -469012,7 +469185,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "71066142d40077e42cb8c551e60ad7f0973f5100",
+        "aed278716d11050df1124381db7bb6bac6fc5d16",
         [
          null,
          {
@@ -469021,7 +469194,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "7545ef13019cd4acf3415e3c78f980f61ccadb38",
+        "74212a61fb82e4185af401cc1ae19bbee2f12180",
         [
          null,
          {
@@ -469030,7 +469203,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "a843e75fd25d7e2076285ab1fd03cce0984bca39",
+        "de1c533bfc83394acb6b52de86b23da31429d462",
         [
          null,
          {
@@ -469057,7 +469230,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "619a3b3039479549deca9374843506fe0541129b",
+        "bc0657d31ca8fbcb5e2262b707d2661f860356ee",
         [
          null,
          {
@@ -469066,7 +469239,7 @@
         ]
        ],
        "xhr.http.html": [
-        "e0e971b380c254c13265acdbfb4f0c8d2176ea98",
+        "a54c8dec65e665c588931ca7795bd998754ecf47",
         [
          null,
          {
@@ -469077,7 +469250,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "48e93db1fd19a63269520e41af70917778e2f22a",
+        "4722bc8f9224f2583a7f71d4bc2469f3d5f70196",
         [
          null,
          {
@@ -469086,7 +469259,7 @@
         ]
        ],
        "fetch.http.html": [
-        "ba590382717b76f1fa180baf74b0e42caa5f6237",
+        "ca88a138c07d2844e91d8252fd66a0a51e9690ba",
         [
          null,
          {
@@ -469095,7 +469268,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "fd13662ae182d1168412386337acb6c29649a10a",
+        "a95cfde13a64ba8363c3dbfaebcda5788aa47cf4",
         [
          null,
          {
@@ -469104,7 +469277,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "ccb74bb52fa2e8dba226272d18e33291ffacf83e",
+        "81c06823b6ad3f3a3759daddb4339bd11129d68c",
         [
          null,
          {
@@ -469113,7 +469286,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "d62279f4807a092b8c816d80d062bd6f3540eb66",
+        "450ebffcc0207582248118759293bf4d9c42dbf4",
         [
          null,
          {
@@ -469158,7 +469331,7 @@
         ]
        ],
        "xhr.http.html": [
-        "3ca4596a021111aeab120e8c8d2903df35af5cb5",
+        "9069ca99241fbb96169425a3ca09c50501b4d949",
         [
          null,
          {
@@ -469169,7 +469342,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "ba1c6cbabd0010a651f75ea3b1d2a895c1a9d1f3",
+        "5f24860f1752ea9482158111f839085315e21081",
         [
          null,
          {
@@ -469178,7 +469351,7 @@
         ]
        ],
        "fetch.http.html": [
-        "fdb84527ad7cbfa961d2beb3fc39de35b7f872e3",
+        "75e1bac179008804ae1b309a65cd7c4a850583be",
         [
          null,
          {
@@ -469187,7 +469360,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "4b44fec638bc713bc3b56b538e73f73557e9c8cc",
+        "8e40188f6c96725f23f92ccf410c59c489e957ea",
         [
          null,
          {
@@ -469196,7 +469369,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "5cfd0e29868425c1495d91d47cf188e5f7c0025b",
+        "21013c61e48edb361662cd0231005c255edf4a71",
         [
          null,
          {
@@ -469205,7 +469378,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "9011a2adfe1c3775940eb5931ce3de09136ec140",
+        "3e542dbb59a79efd10d6a95c8c82a0488cbab1f6",
         [
          null,
          {
@@ -469223,7 +469396,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "5749ed2e610d03d3d1955238e8aef88f3ae4059e",
+        "5bd7631966481dbc4b146802f3d8ea219756cf88",
         [
          null,
          {
@@ -469250,7 +469423,7 @@
         ]
        ],
        "xhr.http.html": [
-        "47170d8b7191943f6768e540fe582223eadfc5e2",
+        "0e691f80797f333946fa11e43a7aee8c13f72292",
         [
          null,
          {
@@ -469261,7 +469434,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "e269614fd518dc7c8b86e7f619b721864a4aef96",
+        "6ed5f3bb75a70f3c50d561e2754be668e759b3dd",
         [
          null,
          {
@@ -469270,7 +469443,7 @@
         ]
        ],
        "fetch.http.html": [
-        "bd8ce6b7c9d2f37f4953dd9e7ee8ca85d35d03bd",
+        "6ce6800ed1b9b115568b2b82d8441dc8a155bc8e",
         [
          null,
          {
@@ -469279,7 +469452,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "372997630c45bc6ffe5de8a4a3ad2825a6a54296",
+        "6a0c5286868a995f734ccf858dad0fb9ecfbee8b",
         [
          null,
          {
@@ -469288,7 +469461,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "39b1299d892841febac74757434dc2f9b4fcad95",
+        "aed278716d11050df1124381db7bb6bac6fc5d16",
         [
          null,
          {
@@ -469297,7 +469470,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "b8a3ecb10235a71c64dfcf0696451029b9c2d434",
+        "74212a61fb82e4185af401cc1ae19bbee2f12180",
         [
          null,
          {
@@ -469324,7 +469497,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "708909e4856256d8419719a8428712479e6e56e8",
+        "8433c4d9df9afdf0992b5e879346edd24c2ee910",
         [
          null,
          {
@@ -469333,7 +469506,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "619a3b3039479549deca9374843506fe0541129b",
+        "bc0657d31ca8fbcb5e2262b707d2661f860356ee",
         [
          null,
          {
@@ -469342,7 +469515,7 @@
         ]
        ],
        "xhr.http.html": [
-        "70af057f3aee20fd7da71024ee883b730c2f5b6c",
+        "a54c8dec65e665c588931ca7795bd998754ecf47",
         [
          null,
          {
@@ -469353,7 +469526,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "cc4e601f02960c9e83fb9d78c5a8c85d9dd25a39",
+        "c00ba92de5c6e36984862ad0b5a182ff98dc3d0e",
         [
          null,
          {
@@ -469362,7 +469535,7 @@
         ]
        ],
        "fetch.http.html": [
-        "63761b377ed3b8f53927d42830c1d16a51df0a6e",
+        "ed3bc61f01861c675907bbda28afc1e2e0aee24c",
         [
          null,
          {
@@ -469371,7 +469544,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "bc9d347f02fb0a6202967e5693a518eff60a93b2",
+        "a4fb7d8629b47146ed541ab93d3f2cb7761eaee1",
         [
          null,
          {
@@ -469380,7 +469553,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "9e1351ad27ad3f99aee22b954eb6f2b797be5ff4",
+        "948089af7e88852d479077fc6cac2ca6aa60f763",
         [
          null,
          {
@@ -469389,7 +469562,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "8d45840c007bdaee3afebf4002d1c14f678fbb97",
+        "5d152c996afe5a398e751d2c69867a393df120ef",
         [
          null,
          {
@@ -469398,7 +469571,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "a843e75fd25d7e2076285ab1fd03cce0984bca39",
+        "de1c533bfc83394acb6b52de86b23da31429d462",
         [
          null,
          {
@@ -469407,7 +469580,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "27e4d4495a3480e60cf4aa5d6a49fb248cc2c1d7",
+        "c088ac04d7f3359b4146dd8e73c1227871e6f4c3",
         [
          null,
          {
@@ -469416,7 +469589,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "708909e4856256d8419719a8428712479e6e56e8",
+        "8433c4d9df9afdf0992b5e879346edd24c2ee910",
         [
          null,
          {
@@ -469425,7 +469598,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "619a3b3039479549deca9374843506fe0541129b",
+        "bc0657d31ca8fbcb5e2262b707d2661f860356ee",
         [
          null,
          {
@@ -469434,7 +469607,7 @@
         ]
        ],
        "xhr.http.html": [
-        "c2ea9b622e94e91eadc22bf14eec206f3f4b8f2b",
+        "20d3eb1ff827a4b3916b756529ded620418fbe32",
         [
          null,
          {
@@ -469445,7 +469618,7 @@
       },
       "unset": {
        "a-tag.http.html": [
-        "c40ba811b6e554a004557a65f9513f1315c75bf6",
+        "c00ba92de5c6e36984862ad0b5a182ff98dc3d0e",
         [
          null,
          {
@@ -469454,7 +469627,7 @@
         ]
        ],
        "fetch.http.html": [
-        "dfb07032dc5a117327a4e81fdc3cc655205565a5",
+        "ed3bc61f01861c675907bbda28afc1e2e0aee24c",
         [
          null,
          {
@@ -469463,7 +469636,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "6d43a194f891274a2540dce380ef6967711a67b5",
+        "a4fb7d8629b47146ed541ab93d3f2cb7761eaee1",
         [
          null,
          {
@@ -469472,7 +469645,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "661acb823487138d3fad945920db7c263c672907",
+        "948089af7e88852d479077fc6cac2ca6aa60f763",
         [
          null,
          {
@@ -469481,7 +469654,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "07fd5ec6dc5fb2363cac0b4851e17c2fad71684d",
+        "5d152c996afe5a398e751d2c69867a393df120ef",
         [
          null,
          {
@@ -469526,7 +469699,7 @@
         ]
        ],
        "xhr.http.html": [
-        "a353de2b6001acd878d35b40079378ccbc6a5fc8",
+        "20d3eb1ff827a4b3916b756529ded620418fbe32",
         [
          null,
          {
@@ -469539,7 +469712,7 @@
      "srcdoc-inherit.meta": {
       "no-referrer": {
        "a-tag.http.html": [
-        "c296e794fbe24f6bccc6059abc6d416562271095",
+        "36beb5760f365b0ca778012ced1cab5a62ef6cc2",
         [
          null,
          {
@@ -469548,7 +469721,7 @@
         ]
        ],
        "fetch.http.html": [
-        "26cb3e96f22cafaa7c1bedc789480ef66557385d",
+        "ed6e1c7e0cd19514cd5d2147f6459f1b2df93427",
         [
          null,
          {
@@ -469557,7 +469730,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "b150737473a309bca6751c3f4b227eac3f2650ce",
+        "edd06e5c027422cfc8138425014652fae7c35110",
         [
          null,
          {
@@ -469566,7 +469739,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "70c5a3af53e84b3bcddd043f1cfd9ad51d43f732",
+        "9395c9307329353e24bc1cae60c587ff018e8acf",
         [
          null,
          {
@@ -469575,7 +469748,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "64cd47f58d429c30122a29b9535cd1057f4bb042",
+        "0d253b26ea76c83db1526b448b78df5e257b88bc",
         [
          null,
          {
@@ -469611,7 +469784,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "e3185a29fd935e440b35e00219c9c623aeb6efdc",
+        "fb3fba8ef663ccb2216de9c4711a22370b64e6cc",
         [
          null,
          {
@@ -469620,7 +469793,7 @@
         ]
        ],
        "xhr.http.html": [
-        "cea1c7da6cb5140f209d394f35b335360166be2d",
+        "b8a8134149fddfb7905534494798aea034643022",
         [
          null,
          {
@@ -469640,7 +469813,7 @@
         ]
        ],
        "fetch.http.html": [
-        "475ca44bcba0905f37eaa4d9e1f866f122a92945",
+        "b0843010b787a621fd62d768b8e1c61436417fdd",
         [
          null,
          {
@@ -469649,7 +469822,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "9754cae0ccb79ef183aef8000521ebd64e8831e1",
+        "70b6f86033191598f393800bec9635cab4d72a5b",
         [
          null,
          {
@@ -469658,7 +469831,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2573ce2a51aa8db13c4e6083fff4fd011ff813d3",
+        "5d74b8662e55f97d9027bc244458da181e72dcc2",
         [
          null,
          {
@@ -469667,7 +469840,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "c24f793981fea89d94e1388f33e9f98b0fed359c",
+        "9ad1c791693919da38accbda6ebaaa534f4cd89b",
         [
          null,
          {
@@ -469685,7 +469858,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "20cd6ae2977cd0c3f84bf8588ccbca4da8cf493e",
+        "b97f3311f81e4933ab06ccca55dee7353cdf482f",
         [
          null,
          {
@@ -469694,7 +469867,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "36208a2f2301a58204c6672d97c392419a032a84",
+        "0cd0c64765e3925a2dd20e464bffd69b11e945df",
         [
          null,
          {
@@ -469712,7 +469885,7 @@
         ]
        ],
        "xhr.http.html": [
-        "7367fe7a68366e3c2c8c26ea425511eb90387449",
+        "70aee4ec28b381caa02db20a0a860f2913d04457",
         [
          null,
          {
@@ -469723,7 +469896,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "f16d23fb30b2ec8f63699cdafcdb9dcfb28c1bc6",
+        "53d4decc35b27a17b214fa38a7fec8aa8957b8bf",
         [
          null,
          {
@@ -469732,7 +469905,7 @@
         ]
        ],
        "fetch.http.html": [
-        "7e6e3452d697be012200112a4e3195253642987c",
+        "2bb4704f451c3a45acc1a8d575a73d794ad53851",
         [
          null,
          {
@@ -469741,7 +469914,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "caa9d1bb2edb12ca675b52537063a15bcf72c383",
+        "97d69ffe1c0d4fff66317bf91788a8c1324daf97",
         [
          null,
          {
@@ -469750,7 +469923,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "424789d69e446a94c36de5c791b5f26b21833adb",
+        "ba49c9c8ddffb5ad25247ced884e30b409d969c7",
         [
          null,
          {
@@ -469759,7 +469932,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "8ad958190da0dc9124c6aa324bc66a2408b91b0b",
+        "d1eb996cc65c7113236a4da9b90e7551e82495dc",
         [
          null,
          {
@@ -469777,7 +469950,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "328d2677cd76bc9c4e17c737e86436d97ef40965",
+        "1cbe83cc0a03fd00628d6a8b614b8cc2ef8974f1",
         [
          null,
          {
@@ -469786,7 +469959,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "a173a431758d532a9cda63af39a26a5419f8159a",
+        "d90cdc4fbe7d6ba0e55afd33de4b92967b690690",
         [
          null,
          {
@@ -469795,7 +469968,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "3be4fae8983b60bd2baa7ae0d94383f9ba7c463b",
+        "eb55830303db2ec49edf4c1999eb796d33ac22e1",
         [
          null,
          {
@@ -469804,7 +469977,7 @@
         ]
        ],
        "xhr.http.html": [
-        "7129504b24ad3e264b8ff9ead0cde69f66e72327",
+        "3e743c30e3318b2268e527f290779350ab7b3814",
         [
          null,
          {
@@ -469815,7 +469988,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "688fdaeb065d094c160b0e5162027acd9522f5ec",
+        "44879f5d1fc2a3204809373f7b68614cca07ce80",
         [
          null,
          {
@@ -469824,7 +469997,7 @@
         ]
        ],
        "fetch.http.html": [
-        "5e016c79f7c6d9fb3ae68b57e98061135b9c7686",
+        "014222203244162aae9484aa841cf8cfbfe43eba",
         [
          null,
          {
@@ -469833,7 +470006,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "5ba473ec569184d5b4f2e23713df7b352ca51299",
+        "cc80c5b686cb6d28bb22aed04c0da56a286df173",
         [
          null,
          {
@@ -469842,7 +470015,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "c9f97bacd744201b142b0f72a5d321f85cc020d0",
+        "5aae8d81060aae32aa2e6e3bbbaaa7bab2edfdb9",
         [
          null,
          {
@@ -469851,7 +470024,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "ad159a6832f73f317b2e5a7eee111da9053411ec",
+        "0cbe39c632cf08d2d06e90121ce5c9a7403e1532",
         [
          null,
          {
@@ -469860,7 +470033,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "4a684a48ec247226b49dfbc9084596707dc8786b",
+        "6e5f40d54249df8f79c465157704f8609e7745bd",
         [
          null,
          {
@@ -469887,7 +470060,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "ba4c7680eb712b6bbaba9eb73cc62f7fafeaf744",
+        "55eb25bc24fe28f15b8ce6c78e5ba1e72609cf65",
         [
          null,
          {
@@ -469896,7 +470069,7 @@
         ]
        ],
        "xhr.http.html": [
-        "93007affaf485ea5a9e7330892bbdf816bf8de6c",
+        "d5ecdddf67e4c22d438e71490a4e0736015541c2",
         [
          null,
          {
@@ -469907,7 +470080,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "4148e128460e7d9f8a6eff53d2b7c9121fe5c82c",
+        "121fb003b4b359d05390e18788e03b639ab91682",
         [
          null,
          {
@@ -469916,7 +470089,7 @@
         ]
        ],
        "fetch.http.html": [
-        "085e8f1bb9be6f81ddfec2c711219291ff368102",
+        "9ae62490b427a146261ab2f911d5c567b38f879a",
         [
          null,
          {
@@ -469925,7 +470098,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "c90e8c5f8a00699c42727ef1fc87fc2c818946c2",
+        "d197af252e83510ddb1f9338ee4df03ce2b81ce4",
         [
          null,
          {
@@ -469934,7 +470107,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "d6070f0125bc39413c131c1ae3f23ba44ec2cb22",
+        "5745f609da29e712c07f0395f0d24ae88e1a1d17",
         [
          null,
          {
@@ -469943,7 +470116,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "6d6b0d2aaf2fc86a5b972c9eea7343e13608be19",
+        "b60fb20b58c7ca1517d35fe740ec3a709b1ed957",
         [
          null,
          {
@@ -469961,7 +470134,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "5c0e6ad0b86f3c9105fb135a3e7f222102c95daf",
+        "001be4af9705fd705c71db0779dbbce0da58b5b7",
         [
          null,
          {
@@ -469970,7 +470143,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "a110488a0c5e7e987bf7a9deedcc14af7374a189",
+        "58c04ab190584d06826fe359ae9eb66eb7e11cb8",
         [
          null,
          {
@@ -469988,7 +470161,7 @@
         ]
        ],
        "xhr.http.html": [
-        "3f39011b437e1019b78e91d80d0dce1ee61e6f59",
+        "924d350cb5d46614b8e48462b0d2bcdaa3e35b15",
         [
          null,
          {
@@ -469999,7 +470172,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "08e8f3f6c22174447463d55ec141dcc659187644",
+        "2c14a70c2746b18a243bcbccc69756314f1d5cb6",
         [
          null,
          {
@@ -470008,7 +470181,7 @@
         ]
        ],
        "fetch.http.html": [
-        "3a0c75bc15ef5bbd5e9464276d50aee99fd7dcb9",
+        "342365da7fa52988158c873d39a7402edaf7971d",
         [
          null,
          {
@@ -470017,7 +470190,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "083012ea7636c0cd1fd7bc0bd209fbabb0d4ec6a",
+        "be4d7494f5d40e7a38c2732f5bd4e453689e7c96",
         [
          null,
          {
@@ -470026,7 +470199,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "d3dc635d59322d4df132cc2aea33b0ef4bb39d2d",
+        "94e983555215dc0dc0ad8a4987f0e6808e7bb9a1",
         [
          null,
          {
@@ -470035,7 +470208,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "ec72a0eed2655e2527c6596ef7e4d36a9f383169",
+        "4b67d45c7b1055999487a1a4d54c8dd91a51782d",
         [
          null,
          {
@@ -470080,7 +470253,7 @@
         ]
        ],
        "xhr.http.html": [
-        "05802e3cfdfde9305b80dddbc7b5063a134be5ad",
+        "793fe211db1729db4281d7ddd6a17329c4b347ca",
         [
          null,
          {
@@ -470100,7 +470273,7 @@
         ]
        ],
        "fetch.http.html": [
-        "4290b15176bac6ece1c1d6c8429a48afecaae005",
+        "35d7ea426b07106b6b69b346d51498ad9de7a9c9",
         [
          null,
          {
@@ -470109,7 +470282,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "cbaf2624be16495ac973c786080db017c48e0750",
+        "a7ee5d9e24d9218fdaa566bd45ba25ea3d233079",
         [
          null,
          {
@@ -470118,7 +470291,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "86c570926e34d9160b9067dbc1ed242614853636",
+        "c76973736131fc334c2ee39dd91b029f8b464bda",
         [
          null,
          {
@@ -470127,7 +470300,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "e3a6e72d524a7587ed1a46c7c4a300ee9c8f4a68",
+        "76174d3c217698fd8245b8210f46e384e5eb1b59",
         [
          null,
          {
@@ -470136,7 +470309,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "477e644b255d3961c218b0bdef17c0e7ee034167",
+        "8288d864544660639fc4d4e6c8fa58d253f84852",
         [
          null,
          {
@@ -470154,7 +470327,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "e410958029a8de6cda0e53c344a6bf9355d07e3c",
+        "62330f80d023a01f961813dfb6f6f1d7b5b19ffa",
         [
          null,
          {
@@ -470163,7 +470336,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "37a0e23e22cc391031cc9771b380bca49a926a17",
+        "6d3f1993657a07f36954afc0b6db766e54560d61",
         [
          null,
          {
@@ -470172,7 +470345,7 @@
         ]
        ],
        "xhr.http.html": [
-        "4f61cba096b2e37ad033d9705d7c3087ca389750",
+        "a6829c2b3da724c76619bc0d1a0937c85873ffd3",
         [
          null,
          {
@@ -470183,7 +470356,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "dff62c2e7d79e1b241f39a0dc9dcb47fb2c73a56",
+        "3815612c67b481bf6cebee741a925f1aae259dc6",
         [
          null,
          {
@@ -470192,7 +470365,7 @@
         ]
        ],
        "fetch.http.html": [
-        "c066d0b0e25524d50fe7528c6c3b1a3b6fae5c74",
+        "aee1cef03d2cd2bce2d0739e2d23f92262501c4c",
         [
          null,
          {
@@ -470201,7 +470374,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "1668c77e5264455bb6c3d530cd2b6f234f189ed1",
+        "f978f5348553d4bb6194c76dab79636b919389a9",
         [
          null,
          {
@@ -470210,7 +470383,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "c6a8aa79063097b35ca5e7a3b771cf2f4d3b46bf",
+        "df369004aca1bb0a8117c3aeb4e44cf80ae930b9",
         [
          null,
          {
@@ -470219,7 +470392,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "4f19861458b4c1943f7e801532f5a10a967740d3",
+        "62b04cd422aca23447bfa5968409235e249475a1",
         [
          null,
          {
@@ -470246,7 +470419,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "a54ace700bb63c00bcad2016354211e24a1c467d",
+        "9a10d868f1e934539ac183fa7bdd67d76016b84b",
         [
          null,
          {
@@ -470255,7 +470428,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "0864611a324762b2f8a4344327dc840b39f9ae87",
+        "8625bc2be3de23b40ccd5f14b0b5460426e3c96c",
         [
          null,
          {
@@ -470264,7 +470437,7 @@
         ]
        ],
        "xhr.http.html": [
-        "e89ff67aa3425b1639d6f6f42d2c4d3bc4c469f1",
+        "b5e6906ca41009651f55f660dcfdf369a258fb3e",
         [
          null,
          {
@@ -470275,7 +470448,7 @@
       },
       "unset": {
        "a-tag.http.html": [
-        "c40ba811b6e554a004557a65f9513f1315c75bf6",
+        "c00ba92de5c6e36984862ad0b5a182ff98dc3d0e",
         [
          null,
          {
@@ -470284,7 +470457,7 @@
         ]
        ],
        "fetch.http.html": [
-        "3c21a644218ce625ad988b367cd7921467f7b0b1",
+        "ed3bc61f01861c675907bbda28afc1e2e0aee24c",
         [
          null,
          {
@@ -470293,7 +470466,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "ca487492db8a5b03ce45daacf62d94c02556ad84",
+        "a4fb7d8629b47146ed541ab93d3f2cb7761eaee1",
         [
          null,
          {
@@ -470302,7 +470475,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "f774c78c509ce39de8992a557d79e64f000eb46b",
+        "948089af7e88852d479077fc6cac2ca6aa60f763",
         [
          null,
          {
@@ -470311,7 +470484,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "76b530a3c76ac8a4f41d4832f758d8cbf1a0c7ac",
+        "5d152c996afe5a398e751d2c69867a393df120ef",
         [
          null,
          {
@@ -470320,7 +470493,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "a843e75fd25d7e2076285ab1fd03cce0984bca39",
+        "de1c533bfc83394acb6b52de86b23da31429d462",
         [
          null,
          {
@@ -470329,7 +470502,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "27e4d4495a3480e60cf4aa5d6a49fb248cc2c1d7",
+        "c088ac04d7f3359b4146dd8e73c1227871e6f4c3",
         [
          null,
          {
@@ -470338,7 +470511,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "708909e4856256d8419719a8428712479e6e56e8",
+        "8433c4d9df9afdf0992b5e879346edd24c2ee910",
         [
          null,
          {
@@ -470356,7 +470529,7 @@
         ]
        ],
        "xhr.http.html": [
-        "b0dc12ef044f5b3bff563b324881a4abb9d0c7a8",
+        "20d3eb1ff827a4b3916b756529ded620418fbe32",
         [
          null,
          {
@@ -470369,7 +470542,7 @@
      "srcdoc.meta": {
       "no-referrer": {
        "a-tag.http.html": [
-        "11f9f237259572e8017dad24438976faf6729671",
+        "36341adda3934cc6479892abec0386fa22b6e009",
         [
          null,
          {
@@ -470378,7 +470551,7 @@
         ]
        ],
        "fetch.http.html": [
-        "1c629b9b91ef54967fe708fa9554dd8b520d849d",
+        "25451f4dde48cdb67d9f672ee1ed2d78a40aebe8",
         [
          null,
          {
@@ -470387,7 +470560,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "90aabf12765b9c096f39058e9bcf7bf89e2651c9",
+        "c61d37eaf47591bc4139595daf669b70471ddfd2",
         [
          null,
          {
@@ -470396,7 +470569,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "f3212de9326bd05a2c45db8cb8ab7e9841809854",
+        "11da083b28a5b6694693f4868d4b000593147c1b",
         [
          null,
          {
@@ -470405,7 +470578,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "bff2188c65715071dd617b1d2b0122df7917838c",
+        "2212cb9a0cfe5bcdc478c33738bda8567d2a8c41",
         [
          null,
          {
@@ -470423,7 +470596,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "4b636f7b5fbf6a5a5e0e4195fe8ef022f317b1f9",
+        "b09570e831a1f4b20b9e85563aebc66f2fdf7e9f",
         [
          null,
          {
@@ -470441,7 +470614,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "758c5450aedb0bf452d46c586da4979f1849ec54",
+        "140ea2da6fb59be09decde81a0a15820e35c55dc",
         [
          null,
          {
@@ -470450,7 +470623,7 @@
         ]
        ],
        "xhr.http.html": [
-        "e46c3a647301d184d2eee675bbe2d4c8aa9bdf50",
+        "1bbb9c5c75fd5535d032d8eaa27e79d11d8ef5aa",
         [
          null,
          {
@@ -470461,7 +470634,7 @@
       },
       "no-referrer-when-downgrade": {
        "a-tag.http.html": [
-        "68724c1708df37f933f98959d4967354d4d581ec",
+        "ad1b95be6ea60b8b44b62bdf86b7680702fcaa83",
         [
          null,
          {
@@ -470470,7 +470643,7 @@
         ]
        ],
        "fetch.http.html": [
-        "02691e775d93981fef2a152d254a709ff8e5ab4e",
+        "d7a7c2d379424b9aa702a2a23d613d524ba42310",
         [
          null,
          {
@@ -470479,7 +470652,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "8669b55a899dee24a17204a5233d2f46401d9df8",
+        "1a3dd3dd4b74497aefc2ff6d15b75e3a946d8c34",
         [
          null,
          {
@@ -470488,7 +470661,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "244e578558a5ffc56950817e2f4eaa10cccd0470",
+        "7870f4c91321102baac2fa55a02a059dfbeec578",
         [
          null,
          {
@@ -470497,7 +470670,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "97cc4e7a6350f7b0016e4831d88c4d8f99530b9f",
+        "fc27a57138b9e790c0746ff94866d4dcf7f40b86",
         [
          null,
          {
@@ -470506,7 +470679,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "34af03ca6735b6372e0370da5dc1090c7b70d5b3",
+        "74ad68f0008fb441dbe8add3e62811475fbdd5b2",
         [
          null,
          {
@@ -470542,7 +470715,7 @@
         ]
        ],
        "xhr.http.html": [
-        "d1160fb688f3c6a061bc35945961a9f7e9b27dda",
+        "46436365374e60a6cd07c99679d8818c22c4663c",
         [
          null,
          {
@@ -470553,7 +470726,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "c4db1513f60f33e82fcf4d60b0005b75032064e7",
+        "6dc1dacc6983c500d8a7078f627933c65a8ed775",
         [
          null,
          {
@@ -470562,7 +470735,7 @@
         ]
        ],
        "fetch.http.html": [
-        "4d2a7e3a88333c209997d4a5c47da0e20afec573",
+        "bd7784c901553ea2bd76edc1c026f17a040dc449",
         [
          null,
          {
@@ -470571,7 +470744,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "fc6dd5cd35cefde191e1f19f6bcdf5b2e96b2123",
+        "d8824fa9f03e8733e5bcc2de63e3d694e4abfbc6",
         [
          null,
          {
@@ -470580,7 +470753,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "551847872d9980b3bfb2b515052ef798b2fec07d",
+        "49e4bc5070be64c0c75e1efe29984d64df30113b",
         [
          null,
          {
@@ -470589,7 +470762,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "72fbdfed834cbd6db82cd3c39d958f8e57fe9ea0",
+        "a8e94aa0177b608845bdaed38d9f5745e9929058",
         [
          null,
          {
@@ -470607,7 +470780,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "4fef6039978279841f6dd559bd8f94a47727c80e",
+        "b7926c2497516a36579a207750c178e1ff5906dc",
         [
          null,
          {
@@ -470625,7 +470798,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "888d5daad92e24067576d6f3b10d7a6c370a2668",
+        "36a8df402cc21d42b7cb0cf28cc76cd17f4e2f16",
         [
          null,
          {
@@ -470634,7 +470807,7 @@
         ]
        ],
        "xhr.http.html": [
-        "8d927e8173ae9553773324de6f2bd90c2278f453",
+        "5aaaca5685a22e3c75c2140868b8d1fb1b2c6ee5",
         [
          null,
          {
@@ -470645,7 +470818,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "af24ac11e512bade895ce88d70df8e068feb05df",
+        "ee2e6c784398ece1c98eeab05c10638e5e3f965c",
         [
          null,
          {
@@ -470654,7 +470827,7 @@
         ]
        ],
        "fetch.http.html": [
-        "aa73eba7aa9fa47712b69b86687b855d4fa9ba51",
+        "12ddcd65ffac2aa4433a7d0b5692f18008a7640c",
         [
          null,
          {
@@ -470663,7 +470836,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "bff82896d007605f9f28669536439e6490460cf7",
+        "8acad56a6cf1f7d1d5359a706d57d9479adca095",
         [
          null,
          {
@@ -470672,7 +470845,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "ce3147bd42cbce922d7c0a54185618f5bc36fb71",
+        "32c40aea692f847c27ff343b0d352822407139b9",
         [
          null,
          {
@@ -470681,7 +470854,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "afa02cb7d8efb7e9ff37250a255fd734fdbbd3d2",
+        "6e56b646b0b7be374a4ba61526748998dee0aff4",
         [
          null,
          {
@@ -470690,7 +470863,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "d181521dae7b7ee0f6b318488f78f52db33970aa",
+        "cc0fdce675d8c0b9440d80bfbefba81d441bb00b",
         [
          null,
          {
@@ -470726,7 +470899,7 @@
         ]
        ],
        "xhr.http.html": [
-        "07694c5abe483f10ed9a87beeaac8a7e6634aed3",
+        "5776162e7a1ff73d90e8d6db8bee5add60fa99d8",
         [
          null,
          {
@@ -470737,7 +470910,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "d0b8e664f8659bc4f20956a88870a7da369d6615",
+        "aadbf7fb9834e47f26b73ef642bd4b28a5729b90",
         [
          null,
          {
@@ -470746,7 +470919,7 @@
         ]
        ],
        "fetch.http.html": [
-        "f190cf566d598a396efc110dbd23949cd31371d2",
+        "df0fd291aafa137ed6d4ee285f2f2e6debdb0116",
         [
          null,
          {
@@ -470755,7 +470928,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "6d412035e4793d806df62df2d6f6a5fb3037bed4",
+        "8f39518c1482b450c0ad294391d27b7e7a29b8b8",
         [
          null,
          {
@@ -470764,7 +470937,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "9b3f3fe28830fbd1d88c6cfa214ef7688b218228",
+        "76937a1aa7c33f99725ddcefa889a89deafc0ca1",
         [
          null,
          {
@@ -470773,7 +470946,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "5c2e5a3f447d3b3380605e0f92d2c2fdcf9989e8",
+        "2b286d7fe99c65dd116a3cdef15f5124c79c5033",
         [
          null,
          {
@@ -470782,7 +470955,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "ec884c12ddca30d22351632e3a14869f2cf5d95c",
+        "9cf860273c6efcb4f7e185b0a5a931e622364670",
         [
          null,
          {
@@ -470809,7 +470982,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "0e71a00c9a6dd0ed1d87970ab1c0ffb0faf73be5",
+        "1eeb215c53ebcf2a342cb841ebb07abe41bc45a4",
         [
          null,
          {
@@ -470818,7 +470991,7 @@
         ]
        ],
        "xhr.http.html": [
-        "7219ad2a54f1a2f32575bc2b70cd3311bf355fe4",
+        "72e667fa3f1003ecfd91e07b9b874f742610f713",
         [
          null,
          {
@@ -470829,7 +471002,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "e84c3016a2574e100b32e7346f506da96ae0e96a",
+        "753da36466c7faf6185c574b14b69c2dd53a968e",
         [
          null,
          {
@@ -470838,7 +471011,7 @@
         ]
        ],
        "fetch.http.html": [
-        "1f94e6e5731f91a4490161051440caf259c6ed1f",
+        "f96d1f936c6515bd536d03e11926ff9cd5851b0d",
         [
          null,
          {
@@ -470847,7 +471020,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "023119615d5a468d927600d2deb872b863261e6d",
+        "11bc06518f00426426721bffedf71fca0469522c",
         [
          null,
          {
@@ -470856,7 +471029,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "15e26233a450b6083a3848020faa7ea2dec4f330",
+        "19ba6cebb84936337e0bdd0e9f6c25128d2b1f65",
         [
          null,
          {
@@ -470865,7 +471038,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "ef33ade33c7ffda62828ad9e7b03e3b9501f40ec",
+        "5a2729437ca5a8659e6be882e06d7230ba62f54e",
         [
          null,
          {
@@ -470883,7 +471056,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "6142c7cf8b296e3938a95bc269c9dec722d3681c",
+        "567c52ba79830777fab9aa078a1a147f4af5e41f",
         [
          null,
          {
@@ -470892,7 +471065,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fa4b347b7835f9839b39ad954980f1678738c642",
+        "16428d85b9cc085e7410df7191f9123f7f72ecaf",
         [
          null,
          {
@@ -470901,7 +471074,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "e4e8691939ca5f171158d8dfef70992ced4386d6",
+        "73e2d63e717e5c0bcc0eadb2c5e48108d04b968d",
         [
          null,
          {
@@ -470910,7 +471083,7 @@
         ]
        ],
        "xhr.http.html": [
-        "13ff5fc9755b8db454bdad4e056a6e9485f80cab",
+        "64a7218f9195bf0a20ced3e0a2f272c794f1f3ed",
         [
          null,
          {
@@ -470921,7 +471094,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "82922cd3b54bae7dab3df75cbfd8dcdba21d925c",
+        "cf0711b74beb32f5152fe82697a1b310958887ee",
         [
          null,
          {
@@ -470930,7 +471103,7 @@
         ]
        ],
        "fetch.http.html": [
-        "d137e56be000f3536453dc44f9c85e83a8b258fd",
+        "33e4c1a6f7db24fe7743d4f0da0d3130694c44b1",
         [
          null,
          {
@@ -470939,7 +471112,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "83b016d810a79fbe1c1f3ee10f9b5e8854cc26ab",
+        "056c2849aeebf9ff9023b34ad9b968f5101001e9",
         [
          null,
          {
@@ -470948,7 +471121,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "e6989b7b6259d2cb0ed1590cd75cba1dbfdfec9d",
+        "9576422d11c43a1346698f66240b309b5d35fb35",
         [
          null,
          {
@@ -470957,7 +471130,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "bbf0023296e177260b33c73857c70dd949894a69",
+        "b680ebe771db2de5391afe52527de20c13f66b8e",
         [
          null,
          {
@@ -470966,7 +471139,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "c97a419c5d34b120ef523b8a0049ac21aec92f2e",
+        "6af874ec0f6228f58058f8cbc83cef2620da0ff6",
         [
          null,
          {
@@ -470975,7 +471148,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "b1251a00ab86127c7e5aa9b68989362b52f2fb5c",
+        "172f2c15a86b7324f6cfe76d0ef2d41b9746ce68",
         [
          null,
          {
@@ -470984,7 +471157,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "b020d307b158c39e07a3b53874b89e345f3b3aaa",
+        "1e32011c918a08d8ac7c208893f9810ec8480bff",
         [
          null,
          {
@@ -471002,7 +471175,7 @@
         ]
        ],
        "xhr.http.html": [
-        "271ca91add2e8fffb353bf944da9669f583f522c",
+        "259bfeb4b06cea6cd4abc1b8fe4d11ef4042cd72",
         [
          null,
          {
@@ -471013,7 +471186,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "9bc9f831bf0c950213fe1ccb2f0824a8a09f1f80",
+        "ca36059a24a6a00b3a74eea491c46bf114d9d3c1",
         [
          null,
          {
@@ -471022,7 +471195,7 @@
         ]
        ],
        "fetch.http.html": [
-        "0cf6ad6f3935885552be12b1e0306a51d55058a7",
+        "401163abef6259ad1f3cdd579c231dd6a48d3f28",
         [
          null,
          {
@@ -471031,7 +471204,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "e26510ce25ed928cea28797556395954003add20",
+        "403a67545acf23fd47b5165a13acee9b793c8b47",
         [
          null,
          {
@@ -471040,7 +471213,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "7397fc93a55187ca774bb3762ac8f8e1c2c33837",
+        "f06a89ddea6f01c9b124fb92cbbc79554ed8a53b",
         [
          null,
          {
@@ -471049,7 +471222,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "c0528e3d3ed83807f46d2848fe9dd6c6ed960d98",
+        "fba1aa8bcc3b8f6f0902745567a2d0dff5eb475f",
         [
          null,
          {
@@ -471067,7 +471240,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "89b5698e6fe4d3addd9c835f6b417563b4709e58",
+        "c535aa1e16596d50910bc960c9f9e6144a662cf9",
         [
          null,
          {
@@ -471094,7 +471267,7 @@
         ]
        ],
        "xhr.http.html": [
-        "219639f3a6d97bf2200761c9606df02a78b09404",
+        "199ced3e5e37514abad80bc4bbd719926450e71d",
         [
          null,
          {
@@ -471107,7 +471280,7 @@
      "top.http-rp": {
       "no-referrer": {
        "a-tag.http.html": [
-        "9e815f629f5838413f60e9f3636530d9e66231f4",
+        "29adaac66b741de97c5caa966193b87eb6e0332d",
         [
          null,
          {
@@ -471116,7 +471289,7 @@
         ]
        ],
        "fetch.http.html": [
-        "3320e7dedd64b82425544ac088349216f9917aeb",
+        "d6ac45a7284e50f8613ae42418188d34946707dc",
         [
          null,
          {
@@ -471125,7 +471298,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "c5a6c910383fad6d493e7cad295a7ccac8aa7cce",
+        "d39830b579499cb0d29ed872edef335a863c17e7",
         [
          null,
          {
@@ -471134,7 +471307,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "8fa0dbc5b8216bcc324a0f5f4e06faa449ab0ab0",
+        "566c3252ecd190e9aa72d9bc135a9e9285d3fb9f",
         [
          null,
          {
@@ -471143,7 +471316,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "5bed4c11f28981873de6e3337f0a75fac2d5f98c",
+        "63e54ba482aeb4cacbfb5affcbf903375160dac0",
         [
          null,
          {
@@ -471152,7 +471325,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "2b149b9ed87ee0ba0aa23cc46c7d764cea0bccc5",
+        "25bbdd1a08d9c2e798938985bb773b2d18d22de3",
         [
          null,
          {
@@ -471161,7 +471334,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "858ae2c8bc8b3840086049f0a8f8fed8b6919ccd",
+        "5845fa807de92a2314a01db396437ada5c60eea9",
         [
          null,
          {
@@ -471170,7 +471343,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "869faa6d7589028696d75128448a4ad27741cb71",
+        "7297e57a6458743be21455020020addee3de90f0",
         [
          null,
          {
@@ -471188,7 +471361,7 @@
         ]
        ],
        "xhr.http.html": [
-        "77a15e2dd09f55805615a99e047231538e436ea6",
+        "f80b28b5cbc21bb78378deecb255e400c06a1694",
         [
          null,
          {
@@ -471208,7 +471381,7 @@
         ]
        ],
        "fetch.http.html": [
-        "7c953a9fa72cae61e13ae8675adb8e8b35800d88",
+        "5c2ed3836d14eb8cae305036ed791c8950125c04",
         [
          null,
          {
@@ -471217,7 +471390,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "705566d807d4e9eb42fe5abfd6bd80927436d203",
+        "26d595fcc6b4311cc36d51b93969d5fa6d7b7f21",
         [
          null,
          {
@@ -471226,7 +471399,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "7b785694b1cef47a511445b802dee7b95f255af3",
+        "0827ebde9c31f4e101cd611ef7a0376aaac8732f",
         [
          null,
          {
@@ -471235,7 +471408,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "65a8ccf6facbc6ff774b85962bd27a3e2b49d554",
+        "c5cad6a0433af93db1321accab35a1c0e1fbd847",
         [
          null,
          {
@@ -471280,7 +471453,7 @@
         ]
        ],
        "xhr.http.html": [
-        "a6a57b7c443059b0b4b1ee292f06f7694d684753",
+        "b3380b89ba3477605a5fa18ea0d4715fe83eebdc",
         [
          null,
          {
@@ -471291,7 +471464,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "37597a81f502b95574ede38526da193c94aef7c7",
+        "496521351a1f19336145e7db1392930fca7b1e31",
         [
          null,
          {
@@ -471300,7 +471473,7 @@
         ]
        ],
        "fetch.http.html": [
-        "ca2af79a20922036aa4d73714eaaad33c049104f",
+        "b4d01617390870ea78225f6953c81fb868acafc4",
         [
          null,
          {
@@ -471309,7 +471482,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "795622918aadab00b6ee19d4231252ba5fd74e69",
+        "e2eb629831fa0e0905162e5a1d5ca3849032788f",
         [
          null,
          {
@@ -471318,7 +471491,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "dfc9e5b47c564fc6b0951c10a7c577711ad6978a",
+        "f0c99d563a3bf0fd190846fb3aa64f02cba3c202",
         [
          null,
          {
@@ -471327,7 +471500,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "c062f33481f6b614bafae4259bb690c99c4ecd26",
+        "f41884b6847b0fb1ca7934100d2c84ed6db88ccf",
         [
          null,
          {
@@ -471354,7 +471527,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "524de9eb0af3aeb31859061424e8c451bd6f1c13",
+        "4e9a4c49112d598c1087c9198d016e09114cfdc7",
         [
          null,
          {
@@ -471363,7 +471536,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "69852cc2cb97131f617e9d4ac72f1e6f93ca2e90",
+        "57ce11f6f94b83d98c02e271986aef602b8a8750",
         [
          null,
          {
@@ -471372,7 +471545,7 @@
         ]
        ],
        "xhr.http.html": [
-        "cbb1aa517239fab2975f68185a20444218a374e3",
+        "e1d6b7a798f3f3d47a411fdaa29ff052bbd9431d",
         [
          null,
          {
@@ -471383,7 +471556,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "d90774e096e6151744f80a171f1b9b46b27c86b5",
+        "72e159c72e529aa32cc230f40ca467797a5b05be",
         [
          null,
          {
@@ -471392,7 +471565,7 @@
         ]
        ],
        "fetch.http.html": [
-        "b019659e91882c3510263b7d6f41cd27e016e2c9",
+        "1dfb592eebbf2e835eec5ef90657b4dea4a9a6ea",
         [
          null,
          {
@@ -471401,7 +471574,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "e3a8907ac19d7390512d4ae94c6c283388cb2689",
+        "557d6a532357dd12f993cbcec7a476c25079432e",
         [
          null,
          {
@@ -471410,7 +471583,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "e400d731c2770767304b89c0c9cb71839cd9a622",
+        "3987df15184e3eb6b9595f9f718c8c40bd2c949b",
         [
          null,
          {
@@ -471419,7 +471592,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "308240540a03cd17eaad2ac847f510654be9c178",
+        "788c8d04f2b5d90b55fa9077723e8ba66ccd53d0",
         [
          null,
          {
@@ -471428,7 +471601,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "befe32ab221a26ca8dd4e82c918dd9eb00a6feb9",
+        "1bc6f04b8cc73debbc4f14696c74a3169c57fa60",
         [
          null,
          {
@@ -471437,7 +471610,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "c353e26d81deed93bdd6e13878be5b7ac7b1ea7f",
+        "a24ee872ad7db6918870560a814f9ef970994910",
         [
          null,
          {
@@ -471446,7 +471619,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fded5a2a20c96c5ed77f6e6b4ee46048a8950435",
+        "7e6e8f3c5f61bf8f596ca02d8d068a49736cfe19",
         [
          null,
          {
@@ -471455,7 +471628,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "2fcb84fa544f63c6b6c111a6fcdc997185a476c1",
+        "ae453ee0f00ea7897d9ea837d31157c453963796",
         [
          null,
          {
@@ -471464,7 +471637,7 @@
         ]
        ],
        "xhr.http.html": [
-        "54122e015989a7fe86c367e14169c428ed57ec95",
+        "866577c3366b9f6d809b66c138672ac73690beda",
         [
          null,
          {
@@ -471475,7 +471648,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "579f3c2857c1642fe90fbae9e4ac686204a18167",
+        "563e63e4a03729d6930a69f040b406a15693e427",
         [
          null,
          {
@@ -471484,7 +471657,7 @@
         ]
        ],
        "fetch.http.html": [
-        "a392f281028baadce5287d701595156187f7da02",
+        "bc673974f3e491930d5f1af8597b3af42e0b590b",
         [
          null,
          {
@@ -471493,7 +471666,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "9ed41f3905cb73e614aa2efd4697bad4f2f932ab",
+        "50e3b2e755b3fd38a48c6d9bbef3a34bd8783c21",
         [
          null,
          {
@@ -471502,7 +471675,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "22c025b4035ebe9cbc3deb7b3f9e9ff0fa026179",
+        "2f106e6e89310214026268e76265d4072a11c2ff",
         [
          null,
          {
@@ -471511,7 +471684,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "592374a71ad2e6e07e1970b9208025cf981e07c2",
+        "edb8136c04521b615c9045cf346c7ce143502b4c",
         [
          null,
          {
@@ -471529,7 +471702,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "c353e26d81deed93bdd6e13878be5b7ac7b1ea7f",
+        "a24ee872ad7db6918870560a814f9ef970994910",
         [
          null,
          {
@@ -471547,7 +471720,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "2fcb84fa544f63c6b6c111a6fcdc997185a476c1",
+        "ae453ee0f00ea7897d9ea837d31157c453963796",
         [
          null,
          {
@@ -471556,7 +471729,7 @@
         ]
        ],
        "xhr.http.html": [
-        "9c4aebb45f3ea72661e3d260a8b8260a8460613b",
+        "b28d7e378bda9fd5452296869225feb388409cf8",
         [
          null,
          {
@@ -471567,7 +471740,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "6b796b11e140a0dfb582679dfbc124cd7e8c1a5f",
+        "496521351a1f19336145e7db1392930fca7b1e31",
         [
          null,
          {
@@ -471576,7 +471749,7 @@
         ]
        ],
        "fetch.http.html": [
-        "2287eb080c7d706ee4ab08074b318a40cb8ec78a",
+        "b4d01617390870ea78225f6953c81fb868acafc4",
         [
          null,
          {
@@ -471585,7 +471758,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "b03d33776cff39792bb5790063541c0ef9a64ba2",
+        "e2eb629831fa0e0905162e5a1d5ca3849032788f",
         [
          null,
          {
@@ -471594,7 +471767,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2d645870d721350b0e00b760f2bacdaf182ab3b2",
+        "f0c99d563a3bf0fd190846fb3aa64f02cba3c202",
         [
          null,
          {
@@ -471603,7 +471776,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "4baf28e65a6ac94a15e891d5e7258404cfad8d68",
+        "f41884b6847b0fb1ca7934100d2c84ed6db88ccf",
         [
          null,
          {
@@ -471630,7 +471803,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "524de9eb0af3aeb31859061424e8c451bd6f1c13",
+        "4e9a4c49112d598c1087c9198d016e09114cfdc7",
         [
          null,
          {
@@ -471639,7 +471812,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "69852cc2cb97131f617e9d4ac72f1e6f93ca2e90",
+        "57ce11f6f94b83d98c02e271986aef602b8a8750",
         [
          null,
          {
@@ -471648,7 +471821,7 @@
         ]
        ],
        "xhr.http.html": [
-        "92c619c756d5bf82c1121c3ccc3a7429380873f2",
+        "e1d6b7a798f3f3d47a411fdaa29ff052bbd9431d",
         [
          null,
          {
@@ -471659,7 +471832,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "1eb1327b9cda6af5941b05ad0b96be3e8f4e9995",
+        "72e159c72e529aa32cc230f40ca467797a5b05be",
         [
          null,
          {
@@ -471668,7 +471841,7 @@
         ]
        ],
        "fetch.http.html": [
-        "f1f2cda305eb5e89105b29d378f33e5ff8332586",
+        "1dfb592eebbf2e835eec5ef90657b4dea4a9a6ea",
         [
          null,
          {
@@ -471677,7 +471850,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "6019e16a07541916230bf61dbc82c717ac098732",
+        "557d6a532357dd12f993cbcec7a476c25079432e",
         [
          null,
          {
@@ -471686,7 +471859,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "9a8767bbbf8d646dfdf691973283f9774ec612b7",
+        "3987df15184e3eb6b9595f9f718c8c40bd2c949b",
         [
          null,
          {
@@ -471695,7 +471868,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "62538978b802674f7d9319d2c5ec624027b540e6",
+        "788c8d04f2b5d90b55fa9077723e8ba66ccd53d0",
         [
          null,
          {
@@ -471722,7 +471895,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fded5a2a20c96c5ed77f6e6b4ee46048a8950435",
+        "7e6e8f3c5f61bf8f596ca02d8d068a49736cfe19",
         [
          null,
          {
@@ -471740,7 +471913,7 @@
         ]
        ],
        "xhr.http.html": [
-        "e64ab4f686894fb65fe3b7c14a0adc402cd8b6c9",
+        "866577c3366b9f6d809b66c138672ac73690beda",
         [
          null,
          {
@@ -471751,7 +471924,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "4882d9562dd17c53e2e2de2fdc1dcad17d50d470",
+        "67702eb9257a75acb3d597f1389a952e4798b17b",
         [
          null,
          {
@@ -471760,7 +471933,7 @@
         ]
        ],
        "fetch.http.html": [
-        "11004418408ddd0f9c592d2abde760e6a26846a2",
+        "5c2ed3836d14eb8cae305036ed791c8950125c04",
         [
          null,
          {
@@ -471769,7 +471942,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "66a4e14bfcb11b9a8a4a8aaf14d12f9de61fec42",
+        "26d595fcc6b4311cc36d51b93969d5fa6d7b7f21",
         [
          null,
          {
@@ -471778,7 +471951,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2f3824895fec37f3256c2559a4f4a1ce3ae1cc09",
+        "0827ebde9c31f4e101cd611ef7a0376aaac8732f",
         [
          null,
          {
@@ -471787,7 +471960,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "b6adfab5181d477a13dd3fd069b58e341889bced",
+        "c5cad6a0433af93db1321accab35a1c0e1fbd847",
         [
          null,
          {
@@ -471805,7 +471978,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "c353e26d81deed93bdd6e13878be5b7ac7b1ea7f",
+        "a24ee872ad7db6918870560a814f9ef970994910",
         [
          null,
          {
@@ -471814,7 +471987,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fded5a2a20c96c5ed77f6e6b4ee46048a8950435",
+        "7e6e8f3c5f61bf8f596ca02d8d068a49736cfe19",
         [
          null,
          {
@@ -471832,7 +472005,7 @@
         ]
        ],
        "xhr.http.html": [
-        "f631a7bdafde195201108218a808736967fd5e3d",
+        "b3380b89ba3477605a5fa18ea0d4715fe83eebdc",
         [
          null,
          {
@@ -471843,7 +472016,7 @@
       },
       "unset": {
        "a-tag.http.html": [
-        "17d3584684bd16f623f8ff4689222aba69b637d7",
+        "67702eb9257a75acb3d597f1389a952e4798b17b",
         [
          null,
          {
@@ -471852,7 +472025,7 @@
         ]
        ],
        "fetch.http.html": [
-        "67c7c94c937990714b6b2471ddf9475143cd27a5",
+        "5c2ed3836d14eb8cae305036ed791c8950125c04",
         [
          null,
          {
@@ -471861,7 +472034,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "dde5a90c1d56c76c44857cee367fdbd48befc47a",
+        "26d595fcc6b4311cc36d51b93969d5fa6d7b7f21",
         [
          null,
          {
@@ -471870,7 +472043,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "99c300b8c8183bb667859549bd4428cca60f6383",
+        "0827ebde9c31f4e101cd611ef7a0376aaac8732f",
         [
          null,
          {
@@ -471879,7 +472052,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "4f24b475f7649c34a9bd01f6b4c8550457ae6a43",
+        "c5cad6a0433af93db1321accab35a1c0e1fbd847",
         [
          null,
          {
@@ -471897,7 +472070,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "c353e26d81deed93bdd6e13878be5b7ac7b1ea7f",
+        "a24ee872ad7db6918870560a814f9ef970994910",
         [
          null,
          {
@@ -471906,7 +472079,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fded5a2a20c96c5ed77f6e6b4ee46048a8950435",
+        "7e6e8f3c5f61bf8f596ca02d8d068a49736cfe19",
         [
          null,
          {
@@ -471915,7 +472088,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "2fcb84fa544f63c6b6c111a6fcdc997185a476c1",
+        "ae453ee0f00ea7897d9ea837d31157c453963796",
         [
          null,
          {
@@ -471924,7 +472097,7 @@
         ]
        ],
        "xhr.http.html": [
-        "c9384a47189a2b2828a79ae76a32ecf2685e8289",
+        "b3380b89ba3477605a5fa18ea0d4715fe83eebdc",
         [
          null,
          {
@@ -471937,7 +472110,7 @@
      "top.meta": {
       "no-referrer": {
        "a-tag.http.html": [
-        "e6245bb61470ac4a7d3ee408dbb4a1ee5156822a",
+        "3760f51c6d3efde7717ac8311d7ae8808e2eeea9",
         [
          null,
          {
@@ -471946,7 +472119,7 @@
         ]
        ],
        "fetch.http.html": [
-        "05ddd5416347a2e0c40d92ac0094b1d448244374",
+        "046e853074e22df1f4e719e95944b8352dcc81ea",
         [
          null,
          {
@@ -471955,7 +472128,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "15842a1098b1de34f268485c9141fb5464b3e7b8",
+        "3954e67fffb0aff5092047dd83a7a6fec15fea7b",
         [
          null,
          {
@@ -471964,7 +472137,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "3182275440d4c3150b78dd01faadb353d52ab094",
+        "e3720a2df7e387c7ddb5724fd175783490f72add",
         [
          null,
          {
@@ -471973,7 +472146,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "eac102ac92e670949ed588764c14f85e64cf937f",
+        "0bb90ddc53891b8045f1f3979f1eaade157a12ee",
         [
          null,
          {
@@ -471982,7 +472155,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "c90577a54edf15834c6b9cc5a7d69cf29e2e4f96",
+        "b0a58ec0711b37fa7fdf0c6a2c22de894cf1026f",
         [
          null,
          {
@@ -471991,7 +472164,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "4852ee335aaa6e6cf952a9d1b0e114a9d1c0bf53",
+        "0de18a801ebe9b6521776959dff3c877efce13d5",
         [
          null,
          {
@@ -472000,7 +472173,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "1033835e94f6e893c79325ca04d85d5fda763a8e",
+        "61ef7547b3260a92e6ada13bcb9ed6ba440d37af",
         [
          null,
          {
@@ -472009,7 +472182,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "a8e93024a284164a3b8ab431a987be042360a5a7",
+        "b90c47fb4a9a7588f218af28fcbd021a26956172",
         [
          null,
          {
@@ -472018,7 +472191,7 @@
         ]
        ],
        "xhr.http.html": [
-        "9eac0101d9af3d5ec1ad53b8f1f8ebd443d3f561",
+        "365ae53ee9efa66323bd32a60d083627196f198c",
         [
          null,
          {
@@ -472029,7 +472202,7 @@
       },
       "no-referrer-when-downgrade": {
        "a-tag.http.html": [
-        "833f8e17b9f13426b010afb6425bc9e71827bb36",
+        "053832d237da6e2ad04a9be037789d4b68c928fd",
         [
          null,
          {
@@ -472038,7 +472211,7 @@
         ]
        ],
        "fetch.http.html": [
-        "fc8f1d9f52d6cba629cdf9349253357ebffdb345",
+        "fbff2ccc7dce0fac2cb2ba1fecc52f3ee40d3eba",
         [
          null,
          {
@@ -472047,7 +472220,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "8706574d56796afbce4e50b1f23e9eccf10792f1",
+        "94de097619e65500fd1b1ddc14b214407fc681d4",
         [
          null,
          {
@@ -472056,7 +472229,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "630042379e772a9bf50b074a0d34d7046cc069b3",
+        "87ed2485e47fc94441c1426a28518a33b691384d",
         [
          null,
          {
@@ -472065,7 +472238,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "a864a9eacf4871840e99d3c47473d90da21c7c4f",
+        "b32b60eee9626eeff3a609e81c913acda77224e7",
         [
          null,
          {
@@ -472083,7 +472256,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "966ce5342365712e612cb9cbdce0d8e941126a76",
+        "1fb406cc8764b51569fb80b0a1dc48cfbdcfbe06",
         [
          null,
          {
@@ -472110,7 +472283,7 @@
         ]
        ],
        "xhr.http.html": [
-        "1ba3a910fe45934c958d2bee3b8ca8bf347a78de",
+        "ba439701ab41ccfb5dd41562ea2a0b0250580cc2",
         [
          null,
          {
@@ -472121,7 +472294,7 @@
       },
       "origin": {
        "a-tag.http.html": [
-        "0f3871d3e2af260f944b23ecf341ee8471d627ca",
+        "9eed6b4cc568078e9330300a30c3f4b9c89c25fc",
         [
          null,
          {
@@ -472130,7 +472303,7 @@
         ]
        ],
        "fetch.http.html": [
-        "aba770d8bd1497f52c59438f138ac3f1afadeea9",
+        "9e0eb9df863c12f0794d3f631294c513d7ed3b68",
         [
          null,
          {
@@ -472139,7 +472312,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "cc5a0b4bacd188876b8687fe67290191cdbbc4a1",
+        "b2de0586e5c38a1bb2f3e8c8d659574e2990ccc2",
         [
          null,
          {
@@ -472148,7 +472321,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "dc8bdd9a60c5cfe6426d83d598599e15a11e9b01",
+        "0be153073e4377ab13888371aed60b822955010f",
         [
          null,
          {
@@ -472157,7 +472330,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "8b4bf54aa128bfc04a403760dbd5898a2befffca",
+        "1dd703daa8de27de1bdf962975e07593a338a5d8",
         [
          null,
          {
@@ -472193,7 +472366,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "3e1a50e46276c9ccd19e54e1c737ccb6562a638d",
+        "f5d00f8139f6dc0a04f2b8341f1dea000a8c4a35",
         [
          null,
          {
@@ -472202,7 +472375,7 @@
         ]
        ],
        "xhr.http.html": [
-        "9b11e25cbb1f69e67d0b8c1571256cfeeaca8ece",
+        "ce3c63264f2f1463014e932007014483cafe7494",
         [
          null,
          {
@@ -472213,7 +472386,7 @@
       },
       "origin-when-cross-origin": {
        "a-tag.http.html": [
-        "7ecd1c9eb8265027c4fe6c231f22e64a104bcddc",
+        "c90fbac8471f9a653b29d20ad3751c8fbcca1f8b",
         [
          null,
          {
@@ -472222,7 +472395,7 @@
         ]
        ],
        "fetch.http.html": [
-        "e8cb3a68a6bdb5c2b1caae3918f6f7c3e532c60f",
+        "026d1127cf79926e0c09b361bc8af290bf1c4f89",
         [
          null,
          {
@@ -472231,7 +472404,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "dac3ff42c3aa3eb487bd87a24e25eea116b86bc7",
+        "ac41652006d109f35840b5b9aa79f7e6144e998b",
         [
          null,
          {
@@ -472240,7 +472413,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "2fd0aaa83895c2b16eec45a5e5c3f06e4a93e7ba",
+        "c359cedf9dd7a79ae87ff71bbcd8ea53ba2053c5",
         [
          null,
          {
@@ -472249,7 +472422,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "1ecb302d713fdb2def7482eb9d22ec8f6aeed20d",
+        "e85254c9c29c203f6eafa385952b5004a9958359",
         [
          null,
          {
@@ -472258,7 +472431,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "72dafdf510d52ad7df03206f8dbacf078e691e7c",
+        "164e5a5d6f8963051d027069b69fcd46f46bfee9",
         [
          null,
          {
@@ -472276,7 +472449,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "0d7647f69ee08baebca4a8ff45e94a4401d2ed51",
+        "f63136bb9f403944cabf7a6d058b358e94688e4c",
         [
          null,
          {
@@ -472294,7 +472467,7 @@
         ]
        ],
        "xhr.http.html": [
-        "99db87bbfb62e55539f116793a2e9c0bae42032e",
+        "38f8569c46126f2fce757fb0de4faeb0a86155ab",
         [
          null,
          {
@@ -472305,7 +472478,7 @@
       },
       "same-origin": {
        "a-tag.http.html": [
-        "685a0fdfa106e5ac34359df572682a7118bc8ca7",
+        "e527be69a2fd13abf2573a22e63f917f831b36b9",
         [
          null,
          {
@@ -472314,7 +472487,7 @@
         ]
        ],
        "fetch.http.html": [
-        "9a8a0fcd69971819213f6764ba16d67e2a264a37",
+        "c9edccb7b0b38f9ce24e73e733484e83f272f0f3",
         [
          null,
          {
@@ -472323,7 +472496,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "5bde564c1b911fdbc2bf97205319d919c11297c2",
+        "cffe9aaf42a7330565d425565426cd88a7c8ac3b",
         [
          null,
          {
@@ -472332,7 +472505,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "d6268606e6d99b838728b9d66f5ca8d9da8a0177",
+        "169b379a3066a58ff81832bb0291b892b4372c5d",
         [
          null,
          {
@@ -472341,7 +472514,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "e2bc9e850be415e5ab01fc7730331beb500e1811",
+        "f85b8d09ee7d33325441e9f8c343d6ef57abd63a",
         [
          null,
          {
@@ -472350,7 +472523,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "6f09609ee73b20e5b57ea1baeba8d7791d1b7da3",
+        "dc152cf203bc15d36e4bcf1807d30fde8979e694",
         [
          null,
          {
@@ -472359,7 +472532,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "6e98fc0a9a7d702aa0a9f53dfd6cb001697fc44e",
+        "4af9a84e38f9ab2683bcfc0f065f3da0d4c4791d",
         [
          null,
          {
@@ -472368,7 +472541,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "31351fc0b37cb8efa1aee7143089e16586fc8de9",
+        "238e044777cc37fa5063ce9d59850fff7150f17d",
         [
          null,
          {
@@ -472377,7 +472550,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "7be1046e26fcd78219eca1c992f6009b1d6c24b3",
+        "e12a18771c04b8b4a1aed7e3c1b29a7b149297a9",
         [
          null,
          {
@@ -472386,7 +472559,7 @@
         ]
        ],
        "xhr.http.html": [
-        "5a0bcc62a17600be84097a8229d97c1ba9ecb15d",
+        "f806606e39a4c6f3a9822169e3c76e4229ac296d",
         [
          null,
          {
@@ -472397,7 +472570,7 @@
       },
       "strict-origin": {
        "a-tag.http.html": [
-        "6b6ef4f020124de1670eb7ce5ceb2f43c34d6ef9",
+        "a0d7b82ff0fe83b918dc7753a18ab2cee91972e5",
         [
          null,
          {
@@ -472406,7 +472579,7 @@
         ]
        ],
        "fetch.http.html": [
-        "c69a1913072d27c1d5ce4ac5e7dc8cb7cb0f35c1",
+        "e4a723a02863c2ab625a7494587f892dce5d23ca",
         [
          null,
          {
@@ -472415,7 +472588,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "6991bab2152b26b9f05a2cc1393b33bb1c4e2269",
+        "a9a3f08183dfa4e2d6839e99703f4fbb36bb84ae",
         [
          null,
          {
@@ -472424,7 +472597,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "01fb229751aab57dd077f6ce830c67d050f5d842",
+        "61caa7b5deb5c81137a9848e2be1d1cf3e82b945",
         [
          null,
          {
@@ -472433,7 +472606,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "9394ebd19d9c168d766054f8bebbfeb1f6dce112",
+        "f8502d76ec48c99af07e2d0ac1200a8667919863",
         [
          null,
          {
@@ -472451,7 +472624,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "049341ced7f602965e8d581bd3052080cbc88c63",
+        "6950b050074f397167a26470f72ed8ba43be4129",
         [
          null,
          {
@@ -472478,7 +472651,7 @@
         ]
        ],
        "xhr.http.html": [
-        "73911039d94d204d645fec96841dfed7c8601c41",
+        "08fe4b8add017f7a3491bbf913cdb2ca7eab3205",
         [
          null,
          {
@@ -472489,7 +472662,7 @@
       },
       "strict-origin-when-cross-origin": {
        "a-tag.http.html": [
-        "31b591a3803a1302153407943803e358290c35f9",
+        "c90830faece9be944ac795fb6fe787338e36a8f0",
         [
          null,
          {
@@ -472498,7 +472671,7 @@
         ]
        ],
        "fetch.http.html": [
-        "e005fb26f39257a8528e081a5872fedf8e8cf872",
+        "76475a2a487830e05d5ccb0666b88d39e5f8365c",
         [
          null,
          {
@@ -472507,7 +472680,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "45f24b7b9735f23a16c23bbaa29a6ac9892785c4",
+        "261b31cea303331cfd623a57bc82c03a76095b5c",
         [
          null,
          {
@@ -472516,7 +472689,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "a4596ccfa9daab91ff9f36d3e2498e6395f4d862",
+        "f84e23faa9feab0d27b33001b9e70b743cea8166",
         [
          null,
          {
@@ -472525,7 +472698,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "8e2bcdb2f5ba16e94bd720f043fc9f687f1ae9ac",
+        "692ccd81562927c289b108fce7c40196dc35b4ea",
         [
          null,
          {
@@ -472543,7 +472716,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "ec8e3c39f74445e153085de1f57a3074f5ca20eb",
+        "dca75da7bcdb70be64102293d19f5d8ba816d154",
         [
          null,
          {
@@ -472552,7 +472725,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "a6b03ca61159b35b012cb55b564439f2af589e79",
+        "fe4cb622a097deb627f154eddb868dd79b4313c5",
         [
          null,
          {
@@ -472570,7 +472743,7 @@
         ]
        ],
        "xhr.http.html": [
-        "1bf1915b2541375f6ad33d8efa4a649ba3b0e716",
+        "38136d1dfa1886a3f60a82c88f452101ac8b7302",
         [
          null,
          {
@@ -472581,7 +472754,7 @@
       },
       "unsafe-url": {
        "a-tag.http.html": [
-        "84799d5c5481c878264276afc486e11560e80b59",
+        "f25dfbc5fd9332b08035b0b91d050b5b732233da",
         [
          null,
          {
@@ -472590,7 +472763,7 @@
         ]
        ],
        "fetch.http.html": [
-        "895257a0c46cb9229ab0107886f7a8fdc5528494",
+        "46eb2b9d87916b84ef65a759e208858ad85554f1",
         [
          null,
          {
@@ -472599,7 +472772,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "f9d2e150742eba99ea434e838bb0076d3eb8f4fe",
+        "f84dba4815066cfbd4a8d30db34eef2f54b2070b",
         [
          null,
          {
@@ -472608,7 +472781,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "08ae5b9c2d7fb694b45dcbb2f872133caca43afd",
+        "8f8b278cff6c76ce3833c56c6f0662e72017ddc1",
         [
          null,
          {
@@ -472617,7 +472790,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "cc7d0d28e6cd1973ddee71d3d556d680236787c1",
+        "b99cb1a63631df004c68eb27d999bedc9d51a861",
         [
          null,
          {
@@ -472644,7 +472817,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "ab217c7207f80b2610b622645a9f8195a2eca649",
+        "0d76a82ae5bd2c6b3f43c2a0bff3e4bad6d6ff0c",
         [
          null,
          {
@@ -472653,7 +472826,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "2f09cbe2abff012131caa07dfdb7f0f81ea29dca",
+        "2725051576f2ad8f4f22081e07105bc5182a366a",
         [
          null,
          {
@@ -472662,7 +472835,7 @@
         ]
        ],
        "xhr.http.html": [
-        "a9e88dcd4b908953e4313be86f597fdf23a62504",
+        "b77d9ed3dff8b6cb6180248edbd31937ae0bdfcb",
         [
          null,
          {
@@ -472673,7 +472846,7 @@
       },
       "unset": {
        "a-tag.http.html": [
-        "f0653a3528ebe1b806bb1b1a6a179b55233eadc8",
+        "67702eb9257a75acb3d597f1389a952e4798b17b",
         [
          null,
          {
@@ -472682,7 +472855,7 @@
         ]
        ],
        "fetch.http.html": [
-        "b60e74b6c8d8af83590bb20891d8d0571ac7e56c",
+        "5c2ed3836d14eb8cae305036ed791c8950125c04",
         [
          null,
          {
@@ -472691,7 +472864,7 @@
         ]
        ],
        "iframe-tag.http.html": [
-        "1c5b7385a88ebeefd25ef4bccf9313e39dfd8468",
+        "26d595fcc6b4311cc36d51b93969d5fa6d7b7f21",
         [
          null,
          {
@@ -472700,7 +472873,7 @@
         ]
        ],
        "img-tag.http.html": [
-        "1654461c435add7c94cb599bf988eb20c74524d3",
+        "0827ebde9c31f4e101cd611ef7a0376aaac8732f",
         [
          null,
          {
@@ -472709,7 +472882,7 @@
         ]
        ],
        "script-tag.http.html": [
-        "cf83690a7160c39d2680fec819fe2c5bbc80f7d6",
+        "c5cad6a0433af93db1321accab35a1c0e1fbd847",
         [
          null,
          {
@@ -472718,7 +472891,7 @@
         ]
        ],
        "sharedworker-classic.http.html": [
-        "befe32ab221a26ca8dd4e82c918dd9eb00a6feb9",
+        "1bc6f04b8cc73debbc4f14696c74a3169c57fa60",
         [
          null,
          {
@@ -472727,7 +472900,7 @@
         ]
        ],
        "sharedworker-module.http.html": [
-        "c353e26d81deed93bdd6e13878be5b7ac7b1ea7f",
+        "a24ee872ad7db6918870560a814f9ef970994910",
         [
          null,
          {
@@ -472736,7 +472909,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fded5a2a20c96c5ed77f6e6b4ee46048a8950435",
+        "7e6e8f3c5f61bf8f596ca02d8d068a49736cfe19",
         [
          null,
          {
@@ -472745,7 +472918,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "2fcb84fa544f63c6b6c111a6fcdc997185a476c1",
+        "ae453ee0f00ea7897d9ea837d31157c453963796",
         [
          null,
          {
@@ -472754,7 +472927,7 @@
         ]
        ],
        "xhr.http.html": [
-        "f08273542e3af1a4d40d4b4eb3dc22ddf495d540",
+        "b3380b89ba3477605a5fa18ea0d4715fe83eebdc",
         [
          null,
          {
@@ -472767,7 +472940,7 @@
      "worker-classic.http-rp": {
       "no-referrer": {
        "fetch.http.html": [
-        "f0b5085cf01ba0952ab4a8fda99165a4926b639e",
+        "7fd76e63435ab0b233610c5818e00b225757062b",
         [
          null,
          {
@@ -472776,7 +472949,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "838618abcefdf8b52885098d7bea5fa5b24316eb",
+        "5bec21542b2a4df664754d72b2a333ab242006b8",
         [
          null,
          {
@@ -472794,7 +472967,7 @@
         ]
        ],
        "xhr.http.html": [
-        "780d2972088de1402c6aa7cac0970f41212d4afd",
+        "c86c9717eb46d0d156de2f1e2cd89655d3ee9093",
         [
          null,
          {
@@ -472805,7 +472978,7 @@
       },
       "no-referrer-when-downgrade": {
        "fetch.http.html": [
-        "40d2dfb536909b9dc06804e8890a97cb1843b860",
+        "235b568eddb6c7b087a04213f8f700e872de95e4",
         [
          null,
          {
@@ -472832,7 +473005,7 @@
         ]
        ],
        "xhr.http.html": [
-        "31ecb964c1d48aad79472b4710a8b448508ad9c6",
+        "049f06c7538435dd24d95cb592769acc66709a3a",
         [
          null,
          {
@@ -472843,7 +473016,7 @@
       },
       "origin": {
        "fetch.http.html": [
-        "e3982122d76b5b173ff46d910145d59a6c6e9814",
+        "79d633daa870708a1bb6d8dc16a13cc140863f9a",
         [
          null,
          {
@@ -472861,7 +473034,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "4dcff21a091afcc3f605cef25a01b43ab5b6d329",
+        "537dc9dc1ebb2cefde2feb249339038c442c9ea6",
         [
          null,
          {
@@ -472870,7 +473043,7 @@
         ]
        ],
        "xhr.http.html": [
-        "bfb8ac9630825376fa7626df30f1d4f443594f86",
+        "16f0cebaa56df3c39ea64d0ce8ce922c08dc3cd9",
         [
          null,
          {
@@ -472881,7 +473054,7 @@
       },
       "origin-when-cross-origin": {
        "fetch.http.html": [
-        "04f7ee6382a1bb746a24d02082aa255237783913",
+        "10e759bb29912a16c0faf0300e59b8f8d4ec4648",
         [
          null,
          {
@@ -472890,7 +473063,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "2f28f3d8295e6c380c81a1b57872ee4fc2a41390",
+        "742aa6f0d9fdabcaa0858e52aa24d3d269e00bb5",
         [
          null,
          {
@@ -472899,7 +473072,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "561073b6b8bbbf98dbfcc3a3d3c21dc5fbcb8843",
+        "42da073f5052f9658344c139733954eefc1cf23c",
         [
          null,
          {
@@ -472908,7 +473081,7 @@
         ]
        ],
        "xhr.http.html": [
-        "ddb97f3b6376117dc09c0a87ccdf0105878b8055",
+        "963b15df342891a768cd4fc6c92cd70b50a87a11",
         [
          null,
          {
@@ -472919,7 +473092,7 @@
       },
       "same-origin": {
        "fetch.http.html": [
-        "b1efc9672c8040862ed0096fe462607044cd1efa",
+        "713d3a3b0fa119d3cf4371ff9073bdd76b194d3d",
         [
          null,
          {
@@ -472928,7 +473101,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "cfff603d4d98abbc6fd327379e47e23d25061b6b",
+        "e2a74bd5e9abe093980b6b1e4c22714f7125ff2e",
         [
          null,
          {
@@ -472946,7 +473119,7 @@
         ]
        ],
        "xhr.http.html": [
-        "6a2a9ed930c41b2b7718b758319706791d83fab3",
+        "395bb5f62e081ac81189e980c9b40cf5d929cf1b",
         [
          null,
          {
@@ -472957,7 +473130,7 @@
       },
       "strict-origin": {
        "fetch.http.html": [
-        "ab28d7dfc1be4f89f970feb8ede4061d668e7d30",
+        "9f866a2ec0ee57b94525cad28a40d8f4070eeee4",
         [
          null,
          {
@@ -472984,7 +473157,7 @@
         ]
        ],
        "xhr.http.html": [
-        "12a5daa5b55e424601988d18f3b809f73119a75c",
+        "f737d900f6c83f54871cc26388e9c32c02c74d40",
         [
          null,
          {
@@ -472995,7 +473168,7 @@
       },
       "strict-origin-when-cross-origin": {
        "fetch.http.html": [
-        "d2e8af227ee0e47f5a0ceac099ddf806c72f1b77",
+        "c5ff91bc677be9d1bd3b5bdc2d4c5fdb1ceee201",
         [
          null,
          {
@@ -473004,7 +473177,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "fb4a59d83e8b1aec816301e60d6a085eec9ff788",
+        "6546fe5ecf0cc6438dad98c2af2a6451187cdbcd",
         [
          null,
          {
@@ -473013,7 +473186,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "ad719d3f3a45f473447ab6a5433789d9d134cde4",
+        "81a35cb9da8974399e7760ad4bf6617c1aeb5505",
         [
          null,
          {
@@ -473022,7 +473195,7 @@
         ]
        ],
        "xhr.http.html": [
-        "0c3b514d58d3534f3e77c444f6271079275af693",
+        "e86f975b27d981b00ded893aa2d03ef83623c677",
         [
          null,
          {
@@ -473033,7 +473206,7 @@
       },
       "unsafe-url": {
        "fetch.http.html": [
-        "d6abf201b65720a5898781fc77d447390b1d6261",
+        "39790d452f14a34bd27c921ebb65a879afc97db0",
         [
          null,
          {
@@ -473042,7 +473215,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "d271abcace74898f975e6746f485dcdfa2dcae49",
+        "0f6f2140f373b61deaab876bfa0604e56f796bf3",
         [
          null,
          {
@@ -473051,7 +473224,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "dff929b908b5fa59f5fb1ab20a556dc1e44942e6",
+        "7ef0c81886e483b23d1083633ea0fa00b22bbe93",
         [
          null,
          {
@@ -473060,7 +473233,7 @@
         ]
        ],
        "xhr.http.html": [
-        "3b50f13b0b09ef66f19268919773e4b8534c4361",
+        "31ffe149743767d924d2377a8a0799368fc95206",
         [
          null,
          {
@@ -473071,7 +473244,7 @@
       },
       "unset": {
        "fetch.http.html": [
-        "d9e05ec3e3c36cd89d7ef6cb79e33010ba003792",
+        "3d3478ff9974c17234e1957fc783ec0b4c6ff8b9",
         [
          null,
          {
@@ -473098,7 +473271,7 @@
         ]
        ],
        "xhr.http.html": [
-        "c8c71ad114158c52fce43cd5649d98638f3aa744",
+        "ff58f802a4f0037b9dda103067be4128952e285f",
         [
          null,
          {
@@ -473111,7 +473284,7 @@
      "worker-module.http-rp": {
       "no-referrer": {
        "fetch.http.html": [
-        "bba8c1788e66e1034566cc6335a448239b6d1421",
+        "bc8b3cdf0ca40cf7461acc15ea85c2bb341bea01",
         [
          null,
          {
@@ -473120,7 +473293,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "032d948c89a318b300c41be803088196f573643b",
+        "19eadf3a6739d33c2ed331a457ca82f5863a786e",
         [
          null,
          {
@@ -473138,7 +473311,7 @@
         ]
        ],
        "xhr.http.html": [
-        "b07e2f9a90aca71a7fb7b00d19754f93d5ffbe3d",
+        "0d4d12fa3bdaf8147b4c07cf3f406b769f3f6504",
         [
          null,
          {
@@ -473149,7 +473322,7 @@
       },
       "no-referrer-when-downgrade": {
        "fetch.http.html": [
-        "e3de0eb5f94fd8aa368026028ccf6d3040e60b1f",
+        "fe1a3d25a09db5e76fefcaf115ab94c7be47a19f",
         [
          null,
          {
@@ -473176,7 +473349,7 @@
         ]
        ],
        "xhr.http.html": [
-        "81a9bb8d583c93451e9d0d51e61fb94a15692300",
+        "a2a28d57603f853839a76364da033719fb330ef1",
         [
          null,
          {
@@ -473187,7 +473360,7 @@
       },
       "origin": {
        "fetch.http.html": [
-        "faeee3e8339386a94f63cb9eac8dea0431aa562d",
+        "b8d7d630bbd9136147ad7ee8e0be0bfc56fb4617",
         [
          null,
          {
@@ -473214,7 +473387,7 @@
         ]
        ],
        "xhr.http.html": [
-        "cf8d43536cbb3c1b65a12f2cea82e74984ff8339",
+        "c62b9a29245d69c0bfc5697cd9ef0a47ebe119bd",
         [
          null,
          {
@@ -473225,7 +473398,7 @@
       },
       "origin-when-cross-origin": {
        "fetch.http.html": [
-        "a35fdd9887ae9cc67835ef9909b68c660f6c67c1",
+        "bfd1aafab07624181994d2806153107b44167c9e",
         [
          null,
          {
@@ -473234,7 +473407,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "d5b545dfe37fa7097f161c3d24c9f5bb61e73ec8",
+        "6ca8eead21ecade54ced4e8077e243c92fb62068",
         [
          null,
          {
@@ -473252,7 +473425,7 @@
         ]
        ],
        "xhr.http.html": [
-        "8dfca7cabd97ffa4d536862da61e5f75d530f932",
+        "8547c16770deb06079e688291de5a550bc229065",
         [
          null,
          {
@@ -473263,7 +473436,7 @@
       },
       "same-origin": {
        "fetch.http.html": [
-        "28cb174a080a2425d95b979519108443cedacdb1",
+        "cc62412da81207d7b22f6c63e27459aae44da16f",
         [
          null,
          {
@@ -473281,7 +473454,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "3375dce27f3726f603c494c88f16a2a729da696d",
+        "13562c5ddbc247e42a03a929a1906a60ede638e7",
         [
          null,
          {
@@ -473290,7 +473463,7 @@
         ]
        ],
        "xhr.http.html": [
-        "c4fdc4fe4030eb5a49cb1167fca2f1c20b04a44a",
+        "ed65b9b4d227da72fa3d4646f0d69e5d56d0f7ef",
         [
          null,
          {
@@ -473301,7 +473474,7 @@
       },
       "strict-origin": {
        "fetch.http.html": [
-        "3ef2a1dd2f6edd586e78030cbb97d34655c5786d",
+        "1e0c95fcdbbffd888f0129d2359452970f4e2557",
         [
          null,
          {
@@ -473310,7 +473483,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "52e252fb8a9000e6c72de6f95bb650f4b9a3a4de",
+        "5e81e09fbb019a36ff561ce0c749c22daf428e5b",
         [
          null,
          {
@@ -473319,7 +473492,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "54ab3755fd4eec55e20af1e36009bd320d693f3d",
+        "c0d370e8e9da48be69b8250fe2da5f7e7687e4f6",
         [
          null,
          {
@@ -473328,7 +473501,7 @@
         ]
        ],
        "xhr.http.html": [
-        "4f0e18b5331f91e2a3e7a7ddd8000ee37eacac3f",
+        "2751a743d156900b872186a7904e3a8e8e92ee02",
         [
          null,
          {
@@ -473339,7 +473512,7 @@
       },
       "strict-origin-when-cross-origin": {
        "fetch.http.html": [
-        "92ec668fcf9e4985ead2808c479c62edb835731c",
+        "506b3ab3c2f83a80917fdb1ceff49d4424323599",
         [
          null,
          {
@@ -473357,7 +473530,7 @@
         ]
        ],
        "worker-module.http.html": [
-        "1ca4d61d376c7cf0b7b2dc14c7249f28187af122",
+        "06f706202621916e8c3db387f860a48091384d01",
         [
          null,
          {
@@ -473366,7 +473539,7 @@
         ]
        ],
        "xhr.http.html": [
-        "8ee62364f2040cb48fcd33c4ae2013910b865b13",
+        "579e294ff061e92c6833f13c2218b8b501419c00",
         [
          null,
          {
@@ -473377,7 +473550,7 @@
       },
       "unsafe-url": {
        "fetch.http.html": [
-        "00eacc02afd34b8325b16dfdc7ca7e5f9d0465aa",
+        "b07a1144da8691fc50514d313752c77ab870f0e2",
         [
          null,
          {
@@ -473386,7 +473559,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "1dd2b944a5fc81cbe7fe7af614ebdc28c9cafae4",
+        "f5f0fd461b6d3973c6959dbf0e246baf716e4e52",
         [
          null,
          {
@@ -473404,7 +473577,7 @@
         ]
        ],
        "xhr.http.html": [
-        "b2a3eea3c3ccab7994a9deb92f5ce3541e526492",
+        "2c1f53cd9adfd82a3ad17499aaabbc05ae31bd0e",
         [
          null,
          {
@@ -473415,7 +473588,7 @@
       },
       "unset": {
        "fetch.http.html": [
-        "7909b673ab899b061df6f1e4d267dde2f009067d",
+        "790fcc5963b1e7e8d1572174c8cf22735f42d08a",
         [
          null,
          {
@@ -473424,7 +473597,7 @@
         ]
        ],
        "worker-classic.http.html": [
-        "5ffb93d77d30828477e1973c3326743d48418321",
+        "5c1625fb70ec1bf91d4cf630210b832fc102785a",
         [
          null,
          {
@@ -473442,7 +473615,7 @@
         ]
        ],
        "xhr.http.html": [
-        "71ac7329b7b7096abcefcd9b7a0efd6bdee5b319",
+        "da200bb87ae0e4a5dfc773938215f891316687f0",
         [
          null,
          {
@@ -473658,7 +473831,7 @@
      ]
     ],
     "idlharness.window.js": [
-     "ba40f199633165111ab2bfd37624eb94871052d6",
+     "458bfd0c608b0f36c1b23be6b5a9bc13648e1e6b",
      [
       "remote-playback/idlharness.window.html",
       {
@@ -473674,8 +473847,13 @@
         [
          "script",
          "/common/media.js"
+        ],
+        [
+         "timeout",
+         "long"
         ]
-       ]
+       ],
+       "timeout": "long"
       }
      ]
     ],
@@ -487462,7 +487640,7 @@
      ]
     ],
     "idlharness.window.js": [
-     "f88c9aab27f822023f5784d87dcecd907bd324be",
+     "88573286a2739465fa11ecb04647b8653f43305b",
      [
       "touch-events/idlharness.window.html",
       {
@@ -488200,7 +488378,7 @@
      "iframe-blank-inherit.meta": {
       "unset": {
        "fetch.https.html": [
-        "3956569f06d78cea52c66e03646a916233aa9617",
+        "b601fbbf3dbfb46800f1f57f8bba204011967611",
         [
          null,
          {
@@ -488209,7 +488387,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "01e109324edea381da405d59f4857113b532688f",
+        "fbc73e5872a7a5b9d31502b5ba68db1ce63604bb",
         [
          null,
          {
@@ -488218,7 +488396,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "bb7411da5c535918bcfe3c976ae88e627cb37a6d",
+        "b7b4ba03ee3f4b463c52eb1c7bdd8b343cb4d5a2",
         [
          null,
          {
@@ -488227,7 +488405,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "552e5f9b843d9a8161bacfdfbd4b1b6045302411",
+        "3d9fc6eeb928ed5f6eca4eb0e0c2e3c1a41c2a68",
         [
          null,
          {
@@ -488236,7 +488414,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "7a4503da061ae996a0e74ca79e402758728cb484",
+        "0f345eb901e37ad299a2cfc2497599740e790901",
         [
          null,
          {
@@ -488245,7 +488423,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "7e41d9105bbb383cab242f861eae7acb90d3f922",
+        "c58a8b741c89ab1d98c3993b49b4b122650115df",
         [
          null,
          {
@@ -488263,7 +488441,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "75f5773e1d60c08de5ba38c0e32b4cbd45762e92",
+        "abc67d750240e48d39ada45e5c632383434baf2d",
         [
          null,
          {
@@ -488272,7 +488450,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "249fdd86bc8ba3d7400a9e42ed5a26f941c1ed1e",
+        "f61176cda2be4084fa54b7d773edf5799cf256f7",
         [
          null,
          {
@@ -488281,7 +488459,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "bea5b9d881decc71d2f949ff523d1621d9249a68",
+        "e82a6917d975ed7b91ceb5e332fddd90311a6a01",
         [
          null,
          {
@@ -488290,7 +488468,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "42aada4af1467f08a1364f9226a1be3503fa340a",
+        "7b54ed289efb36f4b762a149368dcdfdb4097417",
         [
          null,
          {
@@ -488299,7 +488477,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "273ae64994ee837256e1d577b4c32dd8960cfbe5",
+        "1d7e1fe5982fdd5c4b25306955de76a4b532c578",
         [
          null,
          {
@@ -488308,7 +488486,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "ed144330daa112af3689e438871473b0b378b801",
+        "81a4e8a2f832e7745b40348da507d73c11219a1a",
         [
          null,
          {
@@ -488317,7 +488495,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "73a374c2f66788c1133a645f4c0378fb82afb000",
+        "0aed1e59ac6efd5ccc720dadf40de4fa0203812b",
         [
          null,
          {
@@ -488326,7 +488504,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "d12705e3136b8c2d22d929ccc8ab7bed69886990",
+        "c143066c787c166415b97bb08ee52afa46aadead",
         [
          null,
          {
@@ -488335,7 +488513,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "353c760e44fcbbe5c570bf0feda4f7daf5efb87d",
+        "3095104f855cc75ed10eb4bd09b5bbc66412fab5",
         [
          null,
          {
@@ -488344,7 +488522,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "b6cd672f9f072783f81ca5c228e66c79a6ee4795",
+        "c7d7f35d1306e209593112ec47ad1bc4e3959e39",
         [
          null,
          {
@@ -488353,7 +488531,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "d49143ee6b7f292f3376035645e023fa68c4ba6d",
+        "43892ec28450221d9883b297b47eff09ebb6fdf7",
         [
          null,
          {
@@ -488362,7 +488540,7 @@
         ]
        ],
        "xhr.https.html": [
-        "40bfeba1921617ed5f15dddfc588967cdf2b44d2",
+        "dd17493029e8c0dce49f4e488b5a3e8d3db3786f",
         [
          null,
          {
@@ -488373,7 +488551,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "d02f4377fec111dec48502dfab1b8618dbe44f8f",
+        "24d3ed9946b95212767d3a4d304f12068c78fcf8",
         [
          null,
          {
@@ -488382,7 +488560,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "4705c84bf3845a7eece78562d3412b6d413ac894",
+        "57fec0607ed54cee338fee7e31ce2c8b06655658",
         [
          null,
          {
@@ -488391,7 +488569,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "cf105651f4941975c004b8d6e324166af26aa190",
+        "0639eb49fc56f900bcf6b35625e554c9be9994e2",
         [
          null,
          {
@@ -488400,7 +488578,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "28c0a307ca8f19de7eba93e2fea66a556598bff4",
+        "5e59b508df0dd4b171143832a57b26740398fd4b",
         [
          null,
          {
@@ -488409,7 +488587,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "f082fc98d25cfa273388a00a0df37bd877b356f4",
+        "6132933adfb0534b7f8db48ee1ad6cb15f36bf90",
         [
          null,
          {
@@ -488418,7 +488596,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "5286a0687dcf1e80f6f5144e5ff352b96a7b1fdc",
+        "2d48b7037bdc48eb347821c7af336b24c98a54ca",
         [
          null,
          {
@@ -488427,7 +488605,7 @@
         ]
        ],
        "websocket.https.html": [
-        "acacd6bacab76f3e0970be6976e8721da1558bbe",
+        "a2e6ad6cafc4fc8253b9520965c49bb5cf523be9",
         [
          null,
          {
@@ -488436,7 +488614,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "83011e09d19dbaa28edd7a01c4657a7b8ad30ef0",
+        "b707f78738d52baafdeca247b6fd610cf2f34fe1",
         [
          null,
          {
@@ -488445,7 +488623,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "1b817a46f78afe2ae650d84d5b8cc8ea367faaa5",
+        "d66684ecee5c3d7d983194aae3d5729981b68179",
         [
          null,
          {
@@ -488454,7 +488632,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "c5a23c3ee710d5e6ef88b96b7750b8f5dce76f29",
+        "2207fcded26f98d83da30addf3eaac291f022617",
         [
          null,
          {
@@ -488463,7 +488641,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "8b763f3bad921933f5b827733fe64daffeb91a1d",
+        "78b39da45b4cdf957d3da97bb7c0946b31204a66",
         [
          null,
          {
@@ -488472,7 +488650,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "57c8bbcfe7ccb1861aedef71036aa1d4ab63c103",
+        "b560ec687e7f3b0f80bd5b474e14aa13c624d8b4",
         [
          null,
          {
@@ -488481,7 +488659,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "4878d8b69f4057db6ea6675ba3b427f23bc99bdd",
+        "4098618e8278d722c29f43fc9f7f56770a8a4fb9",
         [
          null,
          {
@@ -488490,7 +488668,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "b856c3c824a39bd060084df32d1fbdbba84a5eb4",
+        "9dd58b98ab70de7129a0b7f28aaa73b0ea6f9d6d",
         [
          null,
          {
@@ -488499,7 +488677,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "1a88250516cc99d989b16dc9377aa188ef84130d",
+        "5690227c4380287cb6641fcfe85981bd4f0102db",
         [
          null,
          {
@@ -488508,7 +488686,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "892e925e02aa8b5463b3eb05f41c089bd0f5b516",
+        "07aecb674317af92edf0fe461106d26fc60c115b",
         [
          null,
          {
@@ -488517,7 +488695,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "ea72cad04a16e1951c7936cfd707a6899c5898d7",
+        "0bfe4cbfa4c063ad5c5d7db12f0478f6cee81a5b",
         [
          null,
          {
@@ -488526,7 +488704,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "22fc143db2dea87e82d05090f14b8b5274ca1d62",
+        "887fe458cda421172290813862a2b0a31aff3163",
         [
          null,
          {
@@ -488535,7 +488713,7 @@
         ]
        ],
        "xhr.https.html": [
-        "7d0ff6e1a372e03e92ad156485ae13f87ca81a2a",
+        "de3a6213649215d499c1a6e5867c71391d525bae",
         [
          null,
          {
@@ -488548,7 +488726,7 @@
      "sharedworker-classic-data.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "b65bb8451f0f184a431620ba90fc4c5a117b0eb9",
+        "4184e7c158c12b46d2d794e286319dae847a0347",
         [
          null,
          {
@@ -488557,7 +488735,7 @@
         ]
        ],
        "websocket.https.html": [
-        "f1933b620e9b60b4dbf54589eef8c164ccff4d4d",
+        "c41e4cde41f510b811c3b8aec859aeb8d864cae8",
         [
          null,
          {
@@ -488566,7 +488744,7 @@
         ]
        ],
        "xhr.https.html": [
-        "026d771dd7f2eed34eacb4e743591f9ecfb6903f",
+        "62a5883cadb84de71f1c2b0d3b59d4b7cb4cf962",
         [
          null,
          {
@@ -488579,7 +488757,7 @@
      "sharedworker-classic-data.meta": {
       "unset": {
        "fetch.https.html": [
-        "95c36dab7034119665014c2d1404d254857dc17a",
+        "2a7dbda8b59889d2dfa35490d10aca24e001f3d8",
         [
          null,
          {
@@ -488597,7 +488775,7 @@
         ]
        ],
        "xhr.https.html": [
-        "89ab0fe4ef9f8fa5151daa253f943652bccbf5a1",
+        "fa60413af5e6aed779cc71bf07dc9f7381e87dcd",
         [
          null,
          {
@@ -488608,7 +488786,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "eea46ce9648d52c3cbf64c2e9d44a041a34bfd19",
+        "fb39f9bc5c826e34d9c143bc0b98baaf57809d47",
         [
          null,
          {
@@ -488626,7 +488804,7 @@
         ]
        ],
        "xhr.https.html": [
-        "c0447cf3c021d6a7b5b439ed1d1b800d568e2385",
+        "d5f9b891b5c23eb9f0a12701f3be0e83c572a072",
         [
          null,
          {
@@ -488639,7 +488817,7 @@
      "sharedworker-classic.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "eef8276f29ec861d8b4671fb272df243242a53d9",
+        "1d8b60fea6cccaa767b1e86836af04007e6a6510",
         [
          null,
          {
@@ -488648,7 +488826,7 @@
         ]
        ],
        "websocket.https.html": [
-        "bd69ccf95c05b69480b25606eab1e5b857881028",
+        "bb031af962aef49f24a1d9958bbd2c52abb137ef",
         [
          null,
          {
@@ -488657,7 +488835,7 @@
         ]
        ],
        "xhr.https.html": [
-        "6fc52891e287e2c0bd30ee0b92d548ce53964b34",
+        "00c297642fea2ece71b8879d17ad2724f493c0c2",
         [
          null,
          {
@@ -488670,7 +488848,7 @@
      "sharedworker-module-data.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "ea2320e6ce728ef5dfb3a12cf82de59decc9ff12",
+        "a69ca6ebb13f386adac79299865d05c1c8753349",
         [
          null,
          {
@@ -488679,7 +488857,7 @@
         ]
        ],
        "websocket.https.html": [
-        "124a03c37f4cc249708cf4f58bd7efc77c9257af",
+        "df2014e4491b3442e36a92d39e49bb99df09302a",
         [
          null,
          {
@@ -488688,7 +488866,7 @@
         ]
        ],
        "xhr.https.html": [
-        "b04b07adb5740fff3b9c22ae22c444189d753a92",
+        "8790654a036b12c13cf9a2c48c102f84b4cc6039",
         [
          null,
          {
@@ -488701,7 +488879,7 @@
      "sharedworker-module-data.meta": {
       "unset": {
        "fetch.https.html": [
-        "d6b8cdf41712c1c9edc4b5ba5c5e2b5eb62bdda7",
+        "9f8b280cf47e5ea9864dbc16a0bb5a754b9aff88",
         [
          null,
          {
@@ -488710,7 +488888,7 @@
         ]
        ],
        "websocket.https.html": [
-        "a4798e53a062c221e0d21b988a4a304377c52d80",
+        "9861314634870ded51ab4539e9d61a1fb856fa3b",
         [
          null,
          {
@@ -488719,7 +488897,7 @@
         ]
        ],
        "xhr.https.html": [
-        "681c1cee442f6fa825727cbfd03fd0c1be837730",
+        "d71d1f76ed77a83b0216cc85fcf8f18342f77085",
         [
          null,
          {
@@ -488730,7 +488908,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "b355fd0c14c2765bec501b73fd2258d2773460bd",
+        "63cca40cd25ea280d87805100a94208715f7c6f9",
         [
          null,
          {
@@ -488748,7 +488926,7 @@
         ]
        ],
        "xhr.https.html": [
-        "befbb210fc88f7cb9cd041e4b8fe8ab82114f7aa",
+        "279e92e9f17d7a32217622a5dbb0f51b3ac167fb",
         [
          null,
          {
@@ -488761,7 +488939,7 @@
      "sharedworker-module.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "4dcb71be9dc18427f79658b25dfd5c630e191fce",
+        "593c92fa5062c326a8ab669874bd377098f84aa5",
         [
          null,
          {
@@ -488779,7 +488957,7 @@
         ]
        ],
        "xhr.https.html": [
-        "697ca251490963d4a1c5ff5990e8e6af99ec73cd",
+        "d307b33c4911f7252133e6aca425e7e94b9b1aa3",
         [
          null,
          {
@@ -488792,7 +488970,7 @@
      "srcdoc-inherit.meta": {
       "unset": {
        "fetch.https.html": [
-        "24c133ddd6d00c5dc89adddc1f73d9bc35284063",
+        "f8585f64d36f71b94a127707a5867598dd5b7d4f",
         [
          null,
          {
@@ -488801,7 +488979,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "d57b8fe04aff4d2681070c6123bdb0b215c19f6f",
+        "8b63807eaae7712a33da1ba292fd14b6195604ab",
         [
          null,
          {
@@ -488810,7 +488988,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "a44e08e94cf68a041ebbb129821b79372418218d",
+        "e7eb4050e2e66578f2f767ba312f2ccf82236a89",
         [
          null,
          {
@@ -488819,7 +488997,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "2782a740cd4bd10c0ca222c046583a4d24663852",
+        "89db3b1be91cb324f60dbc77c1b2a17fb653fd4a",
         [
          null,
          {
@@ -488828,7 +489006,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "f375867070ef0e79cb2eb153f2993f7904b883c9",
+        "6e61de3bc4a99118667e3d2c614ab7abe7b48a21",
         [
          null,
          {
@@ -488846,7 +489024,7 @@
         ]
        ],
        "websocket.https.html": [
-        "7855319f611ede2c978ca74a8e864f022325f78c",
+        "dfc63fe9b0a7ecac98e46fddbb7207181c985fe3",
         [
          null,
          {
@@ -488855,7 +489033,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "b7a91ecf9779ad14fe8935e5496be58b06a96fc8",
+        "819ef182e91368891d117a2ee50399a86e0ed16f",
         [
          null,
          {
@@ -488864,7 +489042,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "cc301145a9f295a2356a14aae40b81823f8ef676",
+        "c060b0196daa6fd0f30f8ff5de3e399a5dd98315",
         [
          null,
          {
@@ -488873,7 +489051,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "ccb9304d8f81246e0bae4525085d1fd30755add5",
+        "0282683b9d061ca9ec86817bdbd4a466704b7916",
         [
          null,
          {
@@ -488882,7 +489060,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "c1035e2b419f3e0b31d6e7640565deecc2190f59",
+        "0692fb893c609ea0d0e262b20d2fd053c6334668",
         [
          null,
          {
@@ -488891,7 +489069,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "d4b8cff30770ec1f8e823dbca15ed6d0ac6392f2",
+        "7ec880806dedaaf50af66ad673bb0d7cb8ae9b92",
         [
          null,
          {
@@ -488900,7 +489078,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "087bb0545622ce88f8ff3c2d398980660074506e",
+        "40160b4fef12c8d0280fc9b4b2f4e0107a4e41bc",
         [
          null,
          {
@@ -488909,7 +489087,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "86907e4a8ea72b6c2896d633060ec8fa9eeca569",
+        "8dbc7012eda3ee4c35a583220c40af411b35afea",
         [
          null,
          {
@@ -488918,7 +489096,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "285cefce45d69e1e97c2a99a5c0278af57cec4bf",
+        "c2808ac643c0831d1b696ae798cad9be5518a46c",
         [
          null,
          {
@@ -488927,7 +489105,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "b6b3c5a3182a67a824086588f35ed8b00b96ba1b",
+        "cc19e2775c8bf01e1d30f63b3d935422008bc8f8",
         [
          null,
          {
@@ -488936,7 +489114,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "58f6bc766a34b16a2eb55a8d2801887f9b655862",
+        "3ba203f3f9c0e47c539c3cb5c30a2d765138f298",
         [
          null,
          {
@@ -488945,7 +489123,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "b456950c1de42b5402c3b9042a29aad0b1ad441c",
+        "62a48a1661589a852f75515fee103ad8f5f742e4",
         [
          null,
          {
@@ -488954,7 +489132,7 @@
         ]
        ],
        "xhr.https.html": [
-        "86da59ba5bacd23d46c8105f98f9bbe3f16f4180",
+        "3b5047d512aa40e106e98bb21955369b7c966f9a",
         [
          null,
          {
@@ -488965,7 +489143,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "bf99774df654598169466efc5ef914ed22586c52",
+        "117e32f3f504de40ec27f5d5c3a3d16fc77acb74",
         [
          null,
          {
@@ -488974,7 +489152,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "e6e4fa8908b8f86f4855cad9886657cfe45093ab",
+        "679cb54eb2940749b45537739c913c55ddd471b8",
         [
          null,
          {
@@ -488983,7 +489161,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "988adafc49481ad7db012b94ec603da9df89a33c",
+        "e9744a3aec032a36798e0e1593572c00612874b2",
         [
          null,
          {
@@ -488992,7 +489170,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "d1baacbc70b50d45a4c4acf34be5e3b43bc8905b",
+        "3be481acf37aba5fdb419fb94d9b3702b23c9c07",
         [
          null,
          {
@@ -489001,7 +489179,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "0c9819b81616f606961328faf1cfa8c39e02bcdd",
+        "cbd2fabdea74f53a2317c93cef886a990ccf8cbc",
         [
          null,
          {
@@ -489010,7 +489188,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "946ba63f6de29d1d931d212cf14246f1ce79572a",
+        "91e6ecd08e26430c16af4e26688ff93745b2f585",
         [
          null,
          {
@@ -489019,7 +489197,7 @@
         ]
        ],
        "websocket.https.html": [
-        "4081c6525f27319a963555b6d448ecdcbf7ea2f2",
+        "c7f3c265d8c275b792c97f9e0adc2d702acf1517",
         [
          null,
          {
@@ -489028,7 +489206,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "64c5cdec3d034668a3438c31949442d4d413c657",
+        "7c0677a61c9342e11cf95c668afe19db3497f99e",
         [
          null,
          {
@@ -489037,7 +489215,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "2fc6ecad5c896e66beaaca2d5f7f226a55aa2400",
+        "f90e9bd4a8dbd394b855c490e7653f7ca1babd71",
         [
          null,
          {
@@ -489046,7 +489224,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "6b749b48437a4816b9cc17b4d6cce1705a5c597a",
+        "ccd461add227faadf4a0cba5786678fc76cbcbca",
         [
          null,
          {
@@ -489055,7 +489233,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "ed00a2bd9da5234f05931412fbb531f522b12cdf",
+        "c34a6d0782254b85a33e4c0e8ee84acd8e61a6bd",
         [
          null,
          {
@@ -489064,7 +489242,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "34332639c88683f2c43535df0d3aec74d5786a69",
+        "6be85c5e452f0596b5e9901e323b008f8f4d4b0a",
         [
          null,
          {
@@ -489073,7 +489251,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "14185885554b4f32f9d0bda1040d359e3b29a46f",
+        "b0ee36fa6ff332677c333e82225cbda443664c91",
         [
          null,
          {
@@ -489082,7 +489260,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "b31f83c03ee9b748d848e0f350568c85c891f49e",
+        "9636d3f55743c136e2a2aed3e8b97287fb368a6b",
         [
          null,
          {
@@ -489091,7 +489269,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "cbd1d2d42eba55745099b12c9498462004c656d5",
+        "a0b031e4991ea281c6763113706fc74104543833",
         [
          null,
          {
@@ -489100,7 +489278,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "bade461aedf5cbffeb30cf6cd5687d2714077085",
+        "663d0b8238ef5169029b50dfeb3a24a6485c9610",
         [
          null,
          {
@@ -489109,7 +489287,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "4ea2a00137b65f45b9df58041e1af5677a79064f",
+        "48d31775224653afa35b6f994ba7acf986459bec",
         [
          null,
          {
@@ -489118,7 +489296,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "3f7ce8c9b25dc81701887fc433b674097c5de3cb",
+        "69a4c90ec61f29266f759cc3bfeafe36e5e1d362",
         [
          null,
          {
@@ -489127,7 +489305,7 @@
         ]
        ],
        "xhr.https.html": [
-        "3b54477e6283817e139f07d490fe254866e0b032",
+        "c326a81661837f1895bb89b5d09785e251e294ba",
         [
          null,
          {
@@ -489140,7 +489318,7 @@
      "top.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "f7e759e42a2b9fb3e333b2beab9f4eddb112554b",
+        "ff9f627f551f44e63f17bbc4151d4b4a3245da29",
         [
          null,
          {
@@ -489149,7 +489327,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "063dc6b03bafafc7c20e936143333c5b6e756eb5",
+        "d78bcbd80101ef8c9364777593125a586f3202b0",
         [
          null,
          {
@@ -489158,7 +489336,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "f74ae12454a7fda5fb926ba988e143f93b1c9e91",
+        "9950b5b5f515447a7540dd52518b998193736f62",
         [
          null,
          {
@@ -489167,7 +489345,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "c2cb50c2a813fe0c5da68b162b81d1ab2ed1356f",
+        "677dfad716289b5d0ad17a5839956dc38226e393",
         [
          null,
          {
@@ -489176,7 +489354,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "303719094234f84ded4b02c32e97c80c9ceefd5d",
+        "7e268a47af4d140093771cbebf014e27dfd2b2c1",
         [
          null,
          {
@@ -489185,7 +489363,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "937b086170749123e74ecaaa96c351248d540ee4",
+        "4e20a8ab3dfbbfcb0f6489f7111dace180f33b29",
         [
          null,
          {
@@ -489194,7 +489372,7 @@
         ]
        ],
        "websocket.https.html": [
-        "41cbef5d00a4af1a33b537b4494084e3717caaf2",
+        "5573cace64057ec7455b6620a9dfb26b81497caa",
         [
          null,
          {
@@ -489212,7 +489390,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "e26c46dda1dc1929d3bcabd98c598cc3407d660d",
+        "85e1a9c08fe6c9260e6f6ea9baef43a26ee3f09e",
         [
          null,
          {
@@ -489221,7 +489399,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "4bbea1361bfcc7dec530ce27013d731da6d60b91",
+        "5b0dc16408f2d5ca5e76e8c6fc7e98eb7481ccd5",
         [
          null,
          {
@@ -489230,7 +489408,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "67101f6d19c512526cf932eef1f3d1f29fcf0aa1",
+        "a485bfc509061408d2ec9fe8440c1681b20e4822",
         [
          null,
          {
@@ -489239,7 +489417,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "ba7103686aa40a436026e5ebb374d8648a012739",
+        "511ff4625c1134c30a86479c65b077585803578e",
         [
          null,
          {
@@ -489248,7 +489426,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "83bd2f0a2ba05779c65fbba7ec4f305d8f9fff44",
+        "5822f29c88ba40a62265de37593090938c04d491",
         [
          null,
          {
@@ -489257,7 +489435,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "1894f57b4c95c7d7a7b5bc2eb234306d20bc0246",
+        "296e8af847b4f3041a729c9af2297b0d6935316d",
         [
          null,
          {
@@ -489266,7 +489444,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "f640d2539e438e1fadf79f4a3ec9b7148de9c55d",
+        "b7546cc6113a9c69f8d5841d4c0ec7969df0cf2e",
         [
          null,
          {
@@ -489275,7 +489453,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "9d9cc8ac478b011fe6cfab77985955dceee4170c",
+        "3ded6cdf25c150914b7d465406857481d69d2ca4",
         [
          null,
          {
@@ -489284,7 +489462,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "4ecca776aa18b41ec5b9cf7067d8d77937b17f39",
+        "fdc8c9106e67b80710db1581baca8afa02d51d62",
         [
          null,
          {
@@ -489293,7 +489471,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "823eb862c3c5564954ceeb47b7773e345147d826",
+        "2646219a98936d70190ad3e39c368ffec7f6ba41",
         [
          null,
          {
@@ -489302,7 +489480,7 @@
         ]
        ],
        "xhr.https.html": [
-        "9e151850507ace33a72289232f7c89a64c94d1c0",
+        "c85f01adc1d03dffe7d9a18ca0c6e5b8a9dcfa42",
         [
          null,
          {
@@ -489315,7 +489493,7 @@
      "top.meta": {
       "unset": {
        "fetch.https.html": [
-        "d150ea2d689b3ed831c9803b456c1db302d87fd1",
+        "39148c015beb6f73f505d0cc9a49e54f3d87a917",
         [
          null,
          {
@@ -489324,7 +489502,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "4bfc96fb974a59eb9f2706a74759803eab182da1",
+        "12ef5a5b7001d4c1eb9c2cdd23c63df7c5edf5ac",
         [
          null,
          {
@@ -489333,7 +489511,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "824eb27e5685572c9c261e5ac151d6776f28c875",
+        "a78db7560ad855e899d2356351889096d880289c",
         [
          null,
          {
@@ -489342,7 +489520,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "661eb7d3e3fc37d882581a70d45f0eb4a8483794",
+        "4c5295cf7bfd79feb8d6792d31f6ac43ea0733b0",
         [
          null,
          {
@@ -489351,7 +489529,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "83a6bc50fa93379f321ff8b6bf4ec9b10e5a2b01",
+        "dde524fb0fc1c9067a3051dba29aa7be9ed8a027",
         [
          null,
          {
@@ -489360,7 +489538,7 @@
         ]
        ],
        "sharedworker-module.https.html": [
-        "1129964562a4fbfc744fb0103b3c6f0b83e89121",
+        "26776e4df76599ab75d2e58e49098aec66e24612",
         [
          null,
          {
@@ -489387,7 +489565,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "d90bca9dbafade3fe28deba577a3d7e6eb2ca20d",
+        "3669e03083693207e7209c83bff865d417b398fa",
         [
          null,
          {
@@ -489396,7 +489574,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "29677ccb6b261c2e6dfa815e6839403845c5b110",
+        "6e5cce8af6d1a66dd99157ac77311504ac721092",
         [
          null,
          {
@@ -489405,7 +489583,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "e96f2362b17366161348a3275791f1ebbb3e34c5",
+        "4ffc90cd8fc98c67c14aba56326873e8c5fd615b",
         [
          null,
          {
@@ -489414,7 +489592,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "5f6b73b633515945561d876027f35d4983c1ca19",
+        "114f59fbea8af18b72e237e1a62e0167ffef028b",
         [
          null,
          {
@@ -489423,7 +489601,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "d95fda7f21dd2232591bbf794076ec21b1024b3b",
+        "cad1c3580d38c5ad81ded3bc29fe2798012a1d31",
         [
          null,
          {
@@ -489432,7 +489610,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "413997c64bf635ce896fc2c10dd1d774d2673a16",
+        "16ce32b7311eb1cbd1c1221a6bcb85cd58de7f53",
         [
          null,
          {
@@ -489441,7 +489619,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "3fb5e1586f911ba610093ff439a1b4bcf1f74164",
+        "a6c633e97d691b35335cb31b8427944219cba85a",
         [
          null,
          {
@@ -489450,7 +489628,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "34fdc73d7a3617dd32241b350ea6348d3a03788e",
+        "9c7f82d9e201bbacb7457c2ad69c34c5e20e2d80",
         [
          null,
          {
@@ -489459,7 +489637,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "ce44071516f0669f1dd72b1a04f466ba7d0c62f8",
+        "7b484d0a4c45e58b61a428e0ab561f17c82f9e03",
         [
          null,
          {
@@ -489468,7 +489646,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "e2a567edb188da3c85b1190e75c85e6702591696",
+        "dcf2a137289d62be118898f1e51a4a17dccffda2",
         [
          null,
          {
@@ -489477,7 +489655,7 @@
         ]
        ],
        "xhr.https.html": [
-        "7e05d8ed1110c9d2164080294723b039d906d54f",
+        "ccb4ecf4acd4cc6e79ae0a5fcae5821cda76b102",
         [
          null,
          {
@@ -489488,7 +489666,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "e7e9d9ee3b0f1cded9ae8a806a8eecfa3c5923c0",
+        "5b3d886a8aafe2211df3247c5ed4d8bfe36cbd44",
         [
          null,
          {
@@ -489497,7 +489675,7 @@
         ]
        ],
        "iframe-tag.https.html": [
-        "1d93297b18c615d7e048260e41871092b433611b",
+        "76ad9eacc358f91c5e8e0eecbc03dcccbb9234b5",
         [
          null,
          {
@@ -489506,7 +489684,7 @@
         ]
        ],
        "img-tag.https.html": [
-        "d396deba63af2f256b421b18d61bf7f4b28d908c",
+        "6fe8940e13509ed27d964f873ca6954c5e46864a",
         [
          null,
          {
@@ -489515,7 +489693,7 @@
         ]
        ],
        "sharedworker-classic.https.html": [
-        "dbe808d157a62ba85a6255ad72c9868ce06c6c92",
+        "b8ad00fa477e052708527b6b85e1621111c5a328",
         [
          null,
          {
@@ -489524,7 +489702,7 @@
         ]
        ],
        "sharedworker-import-data.https.html": [
-        "d265b6ab51f48f7ce8d905facd7d65ed38ac2751",
+        "3ed32403341fb922196e6aa730313d681573b797",
         [
          null,
          {
@@ -489560,7 +489738,7 @@
         ]
        ],
        "worker-import-data.https.html": [
-        "10e5a0b5024698dcf16fd76309ed8bc9e303356c",
+        "0cb1533b2aa5373e2a4a2b988149c91925bdc8bb",
         [
          null,
          {
@@ -489569,7 +489747,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "a3ae8a2747540a53cb3bcf429917f32d17465151",
+        "c6100c45be549f583d8c0d7c4509c474fc55cafe",
         [
          null,
          {
@@ -489578,7 +489756,7 @@
         ]
        ],
        "worklet-animation-import-data.https.html": [
-        "24d5287e29310bf8d95d3552792a724ebf858e41",
+        "99b161ff5efaf0d4d650c24d24e1d09e73c5b0d5",
         [
          null,
          {
@@ -489587,7 +489765,7 @@
         ]
        ],
        "worklet-animation.https.html": [
-        "9e3a0e1c993590fa5fce1e15f3801db1306a0a8d",
+        "ddded11818a31d45c633523a8c32db3d27cf09b4",
         [
          null,
          {
@@ -489596,7 +489774,7 @@
         ]
        ],
        "worklet-audio-import-data.https.html": [
-        "1f4a23b1141c8bbcc509d85b6c7c3fc5afcdcbbf",
+        "99e634cfaefc0f78dd916234924b31da750547c2",
         [
          null,
          {
@@ -489605,7 +489783,7 @@
         ]
        ],
        "worklet-audio.https.html": [
-        "8b096c6ca011d419aabe55616c7bf20dc7634852",
+        "e49a11154c1a2c3f39e16b1c062af7a9c9524190",
         [
          null,
          {
@@ -489614,7 +489792,7 @@
         ]
        ],
        "worklet-layout-import-data.https.html": [
-        "e615769653f49c80704ea58d0e55d4a72b33fb7f",
+        "c0b3b47918fa8e341915d2f69bce7dd3b71a00ad",
         [
          null,
          {
@@ -489623,7 +489801,7 @@
         ]
        ],
        "worklet-layout.https.html": [
-        "355b275aa4520097110c3028e0a9f58f4cce38cc",
+        "917e5f064a869d48e08f53e6775503bd0ceb71ed",
         [
          null,
          {
@@ -489632,7 +489810,7 @@
         ]
        ],
        "worklet-paint-import-data.https.html": [
-        "0e4aede115839ae9620f7102936b649ec2cd2198",
+        "847e38a536527b85a29774d4fe383c574d9acab0",
         [
          null,
          {
@@ -489641,7 +489819,7 @@
         ]
        ],
        "worklet-paint.https.html": [
-        "3f54a23e9a1f049420916438fd894b9bc65ad80f",
+        "09a5ac2eb73c5bd4ec30a348917f8febc9ce8c5b",
         [
          null,
          {
@@ -489650,7 +489828,7 @@
         ]
        ],
        "xhr.https.html": [
-        "95b1be919fe347512fee2fcfe33b9c7da368b725",
+        "4d16491a4df4647c501579612c90e4fb5d048742",
         [
          null,
          {
@@ -489663,7 +489841,7 @@
      "worker-classic-data.meta": {
       "unset": {
        "fetch.https.html": [
-        "da694db5273ed6e216f2ce81d4e5c3e50d83f119",
+        "607c6828e43d58187c65b62313faa580e8fc8dd4",
         [
          null,
          {
@@ -489681,7 +489859,7 @@
         ]
        ],
        "xhr.https.html": [
-        "e7bc4c8fabac558d44837b9d221f564bbccf4de8",
+        "044aeb16765d0652f2b4ec1c14db4f5f35e02d57",
         [
          null,
          {
@@ -489692,7 +489870,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "be4eaa2efb305ba84bf44184ecf25593ca5c3cfa",
+        "a7e4b9bd7b532404af55d8244a4f0a406b32be8c",
         [
          null,
          {
@@ -489710,7 +489888,7 @@
         ]
        ],
        "xhr.https.html": [
-        "2263b234e6a98110188d6e152f2ad1369cad035c",
+        "5ecc9293b5afb108137b6c6abcf226f46b0bceaa",
         [
          null,
          {
@@ -489723,7 +489901,7 @@
      "worker-classic-inherit.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "c82f6a0ba2dbb7e2fb319235bd4ba8b53df305f4",
+        "ee16cdf93ccf1aa1d7861a5635e6f94f2ff76890",
         [
          null,
          {
@@ -489732,7 +489910,7 @@
         ]
        ],
        "websocket.https.html": [
-        "8eeff5b1441805fc109659535231f09f96ea84fa",
+        "b5c7c6f1114d24449ebe59d73b5fcc780ad23116",
         [
          null,
          {
@@ -489750,7 +489928,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "6fe8db741d2607ce1e52fe98fcb44c4d358de07b",
+        "71b525fd972591acce1efd059ed9947171984917",
         [
          null,
          {
@@ -489759,7 +489937,7 @@
         ]
        ],
        "xhr.https.html": [
-        "0feb767bbe727b906c2f2f4073562153cf4509fd",
+        "5e15f9fde17f90123fe4d85b422a9fe7d731e04f",
         [
          null,
          {
@@ -489772,7 +489950,7 @@
      "worker-classic-inherit.meta": {
       "unset": {
        "fetch.https.html": [
-        "d6aa9233bfc431a35704ffb7308ca09be4ed0d37",
+        "6c530950209f716ea2693c2fc0f5490be07aabc8",
         [
          null,
          {
@@ -489781,7 +489959,7 @@
         ]
        ],
        "websocket.https.html": [
-        "f3bd83f01b83ed4e557a2f4b253673b787db075e",
+        "781a159d8a49af26a056cd8f521880604b7ae965",
         [
          null,
          {
@@ -489790,7 +489968,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "c95f17d7602a181a432955531660bbfce8111f89",
+        "9ae574fbbf8bb42400f632ae17bea3cf23e47acf",
         [
          null,
          {
@@ -489808,7 +489986,7 @@
         ]
        ],
        "xhr.https.html": [
-        "deb51764f46f1d53397996d26392ff31393323da",
+        "4362edad04e26a9820cd77d19b1a5b5772d83d63",
         [
          null,
          {
@@ -489819,7 +489997,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "d03bbb7fb7654a2a3dd6891f60913db8669ffa5c",
+        "0544c21008f050628583835a4b201fd3e74b21fe",
         [
          null,
          {
@@ -489828,7 +490006,7 @@
         ]
        ],
        "websocket.https.html": [
-        "9755a3f7d7adaa466341a8fd76c0feed97df32cd",
+        "6237b53146c46d85f67267c7b74cef04ced81a68",
         [
          null,
          {
@@ -489837,7 +490015,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "93babaf49e12a9406293049223ab237131f4c55e",
+        "abce936167dea5051b74cd57b4f98e698d9e962a",
         [
          null,
          {
@@ -489855,7 +490033,7 @@
         ]
        ],
        "xhr.https.html": [
-        "5140fc4800ac9245009a2cafc4e3e3d1a5eaf273",
+        "7ac3d61e97b2f27234c76de28af68e4d878a1802",
         [
          null,
          {
@@ -489868,7 +490046,7 @@
      "worker-module-data.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "a3fa13ecfd9cd997db80d523a481f7e586cf760b",
+        "9ff76bc7878fa283dac081d136c60de6cd4807b6",
         [
          null,
          {
@@ -489877,7 +490055,7 @@
         ]
        ],
        "websocket.https.html": [
-        "53dc448d6c497c673505ab8c44bac3efb3a50167",
+        "2d8c1bef7eed4b13454c2fbcee399dfe47c285a2",
         [
          null,
          {
@@ -489886,7 +490064,7 @@
         ]
        ],
        "xhr.https.html": [
-        "1125fa454346c5897dba66c4b3dd6a72f5a9dd60",
+        "b406ddd6dab9cf12efa39e17c0b6671c17360a44",
         [
          null,
          {
@@ -489899,7 +490077,7 @@
      "worker-module-data.meta": {
       "unset": {
        "fetch.https.html": [
-        "a3cd2146663d34f350d169a7de36c7c664639234",
+        "4a65c521dfdc8aa428fff3eef1e4342130b5a6e4",
         [
          null,
          {
@@ -489917,7 +490095,7 @@
         ]
        ],
        "xhr.https.html": [
-        "cc450bfef7a0e55367d85228189f80c61a9e363c",
+        "eaad29b7d47b82619c49cbdd823fbf371d076a72",
         [
          null,
          {
@@ -489928,7 +490106,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "b50873f80858af44755b497e8bdfc06549255911",
+        "c0692396730c20a3f31656ec2360d8136860e459",
         [
          null,
          {
@@ -489946,7 +490124,7 @@
         ]
        ],
        "xhr.https.html": [
-        "cc0a17b9f1acd9ead23e96aeacedbba28e538508",
+        "5cce5cce98530bd48b0d3784d04a087326ade89a",
         [
          null,
          {
@@ -489959,7 +490137,7 @@
      "worker-module-inherit.http-rp": {
       "upgrade": {
        "fetch.https.html": [
-        "4cde804eb79399c49f30ed68f12f26e3ea6005d7",
+        "aec22847af30373dcabf279e7e5efd5a581f91d0",
         [
          null,
          {
@@ -489977,7 +490155,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "2df83cc4462bf006b2bbbaf8721040a47d3c267a",
+        "f2b6cd6757832df973601c680dea4e9502b29b53",
         [
          null,
          {
@@ -489986,7 +490164,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "6b32437c20378f66b04b76209bb6d0fc3d3a9b9a",
+        "b9bb11aa42c6f43485406e28bde107589dc40ae5",
         [
          null,
          {
@@ -489995,7 +490173,7 @@
         ]
        ],
        "xhr.https.html": [
-        "ad5f4ff66a48d29149c64a24fcab584d9af9b844",
+        "ba5febfc03af7ec807fa335dc8c583d3781b0c8d",
         [
          null,
          {
@@ -490008,7 +490186,7 @@
      "worker-module-inherit.meta": {
       "unset": {
        "fetch.https.html": [
-        "6707dc37e425606230a39a42c41a25cb05076cb8",
+        "08af12c58488c92e73e3b184339298319ec5cfdc",
         [
          null,
          {
@@ -490026,7 +490204,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "a6a168275fc46aba0eac2ed61f614f847c459d58",
+        "cd1cd15697b28a836d864ea9fcd7cd46611c610a",
         [
          null,
          {
@@ -490044,7 +490222,7 @@
         ]
        ],
        "xhr.https.html": [
-        "d1ebd13509628a14d35b380c41d1f03b5782c9e7",
+        "f5c04836c05f617463a67b6e219e121d13e37e69",
         [
          null,
          {
@@ -490055,7 +490233,7 @@
       },
       "upgrade": {
        "fetch.https.html": [
-        "ce81bb794835ebb5707d9e77ff1579a43c337c40",
+        "dbe7b1460a8e87c687878b3f39e004ee12c64482",
         [
          null,
          {
@@ -490064,7 +490242,7 @@
         ]
        ],
        "websocket.https.html": [
-        "c7410632e17698eac8761419d93c9c71bdcd0690",
+        "a277dfe752d1e5a755645db9e253bc0bbfb572dc",
         [
          null,
          {
@@ -490073,7 +490251,7 @@
         ]
        ],
        "worker-classic.https.html": [
-        "760fd75466fd2973b5ce0be751292e380b105979",
+        "3baf240f36188d7c70e4521c21b941fa24ca4d85",
         [
          null,
          {
@@ -490082,7 +490260,7 @@
         ]
        ],
        "worker-module.https.html": [
-        "5a7168ea992799db3c954f0f428cbba0f8f99e0b",
+        "7bc07b28e28b38d4842583cabca3afd886544915",
         [
          null,
          {
@@ -490091,7 +490269,7 @@
         ]
        ],
        "xhr.https.html": [
-        "cd15c2640caba472bb2b43893aea19efde5c5fb7",
+        "9d1a0fe15a4a5399558a7a2258d362318e4f197d",
         [
          null,
          {
@@ -496177,7 +496355,7 @@
        ]
       ],
       "audioworkletnode-onerror.https.html": [
-       "0914edbb3b0ababb646784be605177c8e4a79a09",
+       "ce39de54671b80a06d6931f5e32267f4bff60333",
        [
         null,
         {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index 70a00a101f6..e35a452a186 100644
--- a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/css-variables/variable-substitution-variable-declaration.html.ini b/tests/wpt/metadata/css/css-variables/variable-substitution-variable-declaration.html.ini
new file mode 100644
index 00000000000..9e37f672721
--- /dev/null
+++ b/tests/wpt/metadata/css/css-variables/variable-substitution-variable-declaration.html.ini
@@ -0,0 +1,4 @@
+[variable-substitution-variable-declaration.html]
+  [target10 --varC]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-variables/variables-substitute-guaranteed-invalid.html.ini b/tests/wpt/metadata/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
new file mode 100644
index 00000000000..5170c0bda67
--- /dev/null
+++ b/tests/wpt/metadata/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
@@ -0,0 +1,10 @@
+[variables-substitute-guaranteed-invalid.html]
+  [Custom properties in a cycle are guaranteed-invalid]
+    expected: FAIL
+
+  [A custom property referencing a cycle is treated as unset]
+    expected: FAIL
+
+  [A custom property referencing a non-existent variable is treated as unset]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/encoding/bom-handling.html.ini b/tests/wpt/metadata/encoding/bom-handling.html.ini
new file mode 100644
index 00000000000..813b55eb6ec
--- /dev/null
+++ b/tests/wpt/metadata/encoding/bom-handling.html.ini
@@ -0,0 +1,4 @@
+[bom-handling.html]
+  [document.characterSet should match the BOM]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index ac66a0c6f33..6df74cbc68e 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -318,21 +318,15 @@
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/plain */*]
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..8456d88e4f3 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,9 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript; charset=windows-1252 text/javascript]
+    expected: FAIL
+
+  [separate text/javascript;charset=windows-1252  text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 30e1b851fd4..58de838d890 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,3 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
+  [X-Content-Type-Options%3A%20%22nosniFF%22]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f1aa94c7ced..8b743f36e1d 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,7 +4,7 @@
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
     expected: NOTRUN
@@ -16,5 +16,5 @@
     expected: NOTRUN
 
   [Non-HTMLElement should not support autofocus]
-    expected: TIMEOUT
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/touch-events/idlharness.window.js.ini b/tests/wpt/metadata/touch-events/idlharness.window.js.ini
index d47a18855a9..83161979656 100644
--- a/tests/wpt/metadata/touch-events/idlharness.window.js.ini
+++ b/tests/wpt/metadata/touch-events/idlharness.window.js.ini
@@ -191,6 +191,3 @@
   [HTMLElement interface: attribute ontouchcancel]
     expected: FAIL
 
-  [idl_test setup]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 661dd318a19..1b62dd0331e 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -74,3 +74,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44046 more errors.\n\tMax AbsError of 1.9961981773376465e+0 at index of 38383.\n\t[38383\]\t-9.9879217147827148e-1\t9.9740600585937500e-1\t1.9961981773376465e+0\t2.0013897706758867e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 15876.\n\t[15876\]\t5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44057 more errors.\n\tMax AbsError of 1.9900983572006226e+0 at index of 12357.\n\t[12357\]\t-9.9751412868499756e-1\t9.9258422851562500e-1\t1.9900983572006226e+0\t2.0049667323212912e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index bb9dc16b484..04c70861243 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -239,3 +239,9 @@
   [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t-9.4121694564819336e-3\t5.6332010030746460e-1\t5.7273226976394653e-1\t1.0167083856076584e+0\t9.0957000000000003e-5\n\t[31081\]\t4.5714559801668507e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0167083856076584e+0 at index of 31080.\n]
     expected: FAIL
 
+  [X SNR (-156.86292147944403 dB) is not greater than or equal to 85.58. Got -156.86292147944403.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t1.0347855872000000e+10\t5.6332010030746460e-1\t1.0347855871436680e+10\t1.8369406427693130e+10\t9.0957000000000003e-5\n\t[31081\]\t4.5671119549274438e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 1.0347855871436680e+10 at index of 31080.\n\tMax RelError of 1.8369406427693130e+10 at index of 31080.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index 268949ced5c..f584fce5df1 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,4 +1,5 @@
 [005.html]
+  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
index 10dda3a6659..6d92f8835c6 100644
--- a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,7 +1,8 @@
 [shared-worker-in-data-url-context.window.html]
+  expected: TIMEOUT
   [Create a shared worker in a data url frame]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Create a data url shared worker in a data url frame]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/web-platform-tests/css/css-env/env-in-custom-properties.tentative.html b/tests/wpt/web-platform-tests/css/css-env/env-in-custom-properties.tentative.html
index ea471b001f2..6dadcc586b0 100644
--- a/tests/wpt/web-platform-tests/css/css-env/env-in-custom-properties.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-env/env-in-custom-properties.tentative.html
@@ -6,18 +6,30 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style>
-      body {
+      #parent {
+        --var1: inherited;
+      }
+      #child {
         --my-width: env(test, 100px);
         width: var(--my-width);
+        --var1: env(nonexistent);
       }
     </style>
   </head>
   <body>
+    <div id="parent">
+      <div id="child"></div>
+    </div>
     <script>
     test(() => {
-      const style = window.getComputedStyle(document.body);
+      const style = window.getComputedStyle(child);
       assert_equals(style.getPropertyValue("width"), "100px");
-    });
+    }, 'env() is substituted into a custom property');
+
+    test(() => {
+      const style = window.getComputedStyle(child);
+      assert_equals(style.getPropertyValue("--var1"), " inherited");
+    }, 'Substitution of unrecognized env() causes unset');
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html
new file mode 100644
index 00000000000..1128ffa1759
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html
@@ -0,0 +1,14 @@
+<!-- quirks mode -->
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test checks that a dynamic change in the height of an element calculates the intrinsic min/max size correctly when a replaced element is present."/>
+<p style="margin-top: 1em;">Test passes if there is a filled green square.</p>
+<div id="target" style="float: left; background: green;">
+  <div>
+    <canvas width="1" height="1" style="height: 100%;"></canvas>
+  </div>
+</div>
+<script>
+  document.body.offsetTop;
+  document.getElementById('target').style.height = '100px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html
new file mode 100644
index 00000000000..f062b8a94cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test checks that a dynamic change in the height of an element calculates the intrinsic min/max size correctly when a replaced element is present."/>
+<p>Test passes if there is a filled green square.</p>
+<div id="target" style="float: left; background: green;">
+  <span>
+    <div style="height: 100%;">
+      <canvas width="1" height="1" style="height: 100%;"></canvas>
+    </div>
+  </span>
+</div>
+<script>
+  document.body.offsetTop;
+  document.getElementById('target').style.height = '100px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html
new file mode 100644
index 00000000000..ef8832a405b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-003.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test checks that a dynamic change in the height of an element calculates the intrinsic min/max size correctly when a replaced element is present."/>
+<p>Test passes if there is a filled green square.</p>
+<div id="target" style="float: left; background: green;">
+  <div style="height: 100%;">
+    <canvas width="1" height="1" style="height: 100%;"></canvas>
+  </div>
+</div>
+<script>
+  document.body.offsetTop;
+  document.getElementById('target').style.height = '100px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html
new file mode 100644
index 00000000000..b0c452b1512
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test checks that a dynamic change in the height of an element calculates the intrinsic min/max size correctly when a replaced element is present."/>
+<p>Test passes if there is a filled green square.</p>
+<div id="target" style="float: left; background: green;">
+  <div style="width: fit-content; height: 100%;">
+    <canvas width="1" height="1" style="height: 100%;"></canvas>
+  </div>
+</div>
+<script>
+  document.body.offsetTop;
+  document.getElementById('target').style.height = '100px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html
new file mode 100644
index 00000000000..87a7a9b93b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-005.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test checks that a dynamic change in the height of an element calculates the intrinsic min/max size correctly when a replaced element is present."/>
+<p>Test passes if there is a filled green square.</p>
+<div style="position: relative; width: 100px; height: 100px;">
+  <div id="target" style="position: absolute; top:0; background: green;">
+    <canvas width="1" height="1" style="height: 100%;"></canvas>
+  </div>
+</div>
+<script>
+  document.body.offsetTop;
+  document.getElementById('target').style.bottom = '0px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html
new file mode 100644
index 00000000000..8ccd3a0bed0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test checks that a dynamic change in the height of an element calculates the intrinsic min/max size correctly when a replaced element is present."/>
+<p>Test passes if there is a filled green square.</p>
+<div id="target" style="float: left; background: green;">
+  <div style="width: 100%; height: 100%;">
+    <canvas width="1" height="1" style="height: 100%;"></canvas>
+  </div>
+</div>
+<script>
+  document.body.offsetTop;
+  document.getElementById('target').style.height = '100px';
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-variable-declaration.html b/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-variable-declaration.html
index 0b0ab1f0f0f..678d05a1acc 100644
--- a/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-variable-declaration.html
+++ b/tests/wpt/web-platform-tests/css/css-variables/variable-substitution-variable-declaration.html
@@ -140,7 +140,7 @@
 
             { element: "target10",      propertyName: "--varA",         expectedPropertyValue: "" },
             { element: "target10",      propertyName: "--varB",         expectedPropertyValue: "" },
-            { element: "target10",      propertyName: "--varC",         expectedPropertyValue: "" },
+            { element: "target10",      propertyName: "--varC",         expectedPropertyValue: " another good one" },
         ];
 
         testcases.forEach(function (testcase) {
diff --git a/tests/wpt/web-platform-tests/css/css-variables/variables-substitute-guaranteed-invalid.html b/tests/wpt/web-platform-tests/css/css-variables/variables-substitute-guaranteed-invalid.html
new file mode 100644
index 00000000000..c30e8746db5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-variables/variables-substitute-guaranteed-invalid.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>Testing substitution of guaranteed-invalid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-variables/#guaranteed-invalid">
+<link rel="help" href="https://drafts.csswg.org/css-variables/#cycles">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+    #target1 {
+        /* Cycle */
+        --var1: var(--var2);
+        --var2: var(--var1);
+
+        /* Reference to cycle */
+        --var3: var(--var1);
+
+        /* Reference to non-existent property */
+        --var4: var(--noexist);
+    }
+
+    #target1parent {
+        --var3: inherited;
+        --var4: inherited;
+    }
+</style>
+<div id="target1parent">
+    <div id="target1"></div>
+</div>
+<script>
+    test( function () {
+        let cs = getComputedStyle(target1);
+        assert_equals(cs.getPropertyValue('--var1'), '');
+        assert_equals(cs.getPropertyValue('--var2'), '');
+    }, 'Custom properties in a cycle are guaranteed-invalid');
+
+    test( function () {
+        let cs = getComputedStyle(target1);
+        assert_equals(cs.getPropertyValue('--var3'), ' inherited');
+    }, 'A custom property referencing a cycle is treated as unset');
+
+    test( function () {
+        let cs = getComputedStyle(target1);
+        assert_equals(cs.getPropertyValue('--var4'), ' inherited');
+    }, 'A custom property referencing a non-existent variable is treated as unset');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element-ref.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element-ref.html
new file mode 100644
index 00000000000..c92741df430
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element-ref.html
@@ -0,0 +1,11 @@
+<!doctype HTML>
+<meta charset="utf-8">
+<title>backdrop-filter: no effect on the root element</title>
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
+<style>
+  html {
+    background: green;
+  }
+</style>
+Test
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element.html
new file mode 100644
index 00000000000..890e6ae51a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-root-element.html
@@ -0,0 +1,13 @@
+<!doctype HTML>
+<meta charset="utf-8">
+<title>backdrop-filter: no effect on the root element</title>
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
+<link rel="match"  href="backdrop-filter-root-element-ref.html">
+<style>
+  html {
+    background: green;
+    backdrop-filter: invert(1);
+  }
+</style>
+Test
diff --git a/tests/wpt/web-platform-tests/editing/data/delete.js b/tests/wpt/web-platform-tests/editing/data/delete.js
index e5ca838f647..db53a3643f6 100644
--- a/tests/wpt/web-platform-tests/editing/data/delete.js
+++ b/tests/wpt/web-platform-tests/editing/data/delete.js
@@ -2474,5 +2474,25 @@ var browserTests = [
     [["delete",""]],
     "<div><b>{}<br></b></div>",
     [true],
+    {"delete":[false,false,"",false,false,""]}],
+["<div><div><p>foo</p></div></div><div></div><div><div>[]bar</div></div></div>",
+    [["delete",""]],
+    "<div><div><p>foobar</p></div></div>",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["<div>foo</div><div></div><div>[]bar</div>",
+    [["delete",""]],
+    "<div>foobar</div>",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["<div>foo</div><span></span><div>[]bar</div>",
+    [["delete",""]],
+    "<div>foobar</div>",
+    [true],
+    {"delete":[false,false,"",false,false,""]}],
+["<div>foo</div><!-- comment --><div>[]bar</div>",
+    [["delete",""]],
+    "<div>foobar</div>",
+    [true],
     {"delete":[false,false,"",false,false,""]}]
 ]
diff --git a/tests/wpt/web-platform-tests/editing/data/forwarddelete.js b/tests/wpt/web-platform-tests/editing/data/forwarddelete.js
index bbc2b11a3ca..2b8829e6721 100644
--- a/tests/wpt/web-platform-tests/editing/data/forwarddelete.js
+++ b/tests/wpt/web-platform-tests/editing/data/forwarddelete.js
@@ -2359,5 +2359,25 @@ var browserTests = [
     [["forwarddelete",""]],
     "<div><b>{}<br></b></div>",
     [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["<div><div><p>foo[]</p></div></div><div></div><div><div>bar</div></div></div>",
+    [["forwarddelete",""]],
+    "<div><div><p>foobar</p></div></div>",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["<div>foo[]</div><div></div><div>bar</div>",
+    [["forwarddelete",""]],
+    "<div>foobar</div>",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["<div>foo[]</div><span></span><div>bar</div>",
+    [["forwarddelete",""]],
+    "<div>foobar</div>",
+    [true],
+    {"forwarddelete":[false,false,"",false,false,""]}],
+["<div>foo[]</div><!-- comment --><div>bar</div>",
+    [["forwarddelete",""]],
+    "<div>foobar</div>",
+    [true],
     {"forwarddelete":[false,false,"",false,false,""]}]
 ]
diff --git a/tests/wpt/web-platform-tests/encoding/bom-handling.html b/tests/wpt/web-platform-tests/encoding/bom-handling.html
new file mode 100644
index 00000000000..ea70d362546
--- /dev/null
+++ b/tests/wpt/web-platform-tests/encoding/bom-handling.html
@@ -0,0 +1,17 @@
+<!-- starts with a UTF-8 BOM -->
+<!doctype html>
+<meta charset="windows-1252">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<title>BOM handling</title>
+<div id=log></div>
+<script>
+
+test(
+  () => {
+    assert_equals(document.characterSet.toLowerCase(), "utf-8");
+  },
+  "document.characterSet should match the BOM"
+);
+
+</script>
diff --git a/tests/wpt/web-platform-tests/encoding/bom-handling.html.headers b/tests/wpt/web-platform-tests/encoding/bom-handling.html.headers
new file mode 100644
index 00000000000..2340a89c93c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/encoding/bom-handling.html.headers
@@ -0,0 +1 @@
+Content-Type: text/html; charset=windows-1252
diff --git a/tests/wpt/web-platform-tests/interfaces/mediasession.idl b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
index 8671af5acd9..059d1ec8cf1 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediasession.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
@@ -69,13 +69,7 @@ dictionary MediaPositionState {
 
 dictionary MediaSessionActionDetails {
   required MediaSessionAction action;
-};
-
-dictionary MediaSessionSeekActionDetails : MediaSessionActionDetails {
   double? seekOffset;
-};
-
-dictionary MediaSessionSeekToActionDetails : MediaSessionActionDetails {
-  required double seekTime;
+  double? seekTime;
   boolean? fastSeek;
 };
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-1.html b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-1.html
new file mode 100644
index 00000000000..495645ab41e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-1.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<title>Largest Contentful Paint: invisible images are not observable</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/invisible-images.js"></script>
+<style>
+  .opacity0 {
+    opacity: 0;
+  }
+  .visibilityHidden {
+    visibility: hidden;
+  }
+  .displayNone {
+    display: none;
+  }
+  .composited {
+    will-change: transform;
+  }
+</style>
+<img src='/images/blue.png' class='opacity0 composited' id='opacity0'/>
+<img src='/images/green.png' class='visibilityHidden composited' id='visibilityHidden'/>
+<img src='/images/red.png' class='displayNone composited' id='displayNone'/>
+<div class='opacity0 composited'><img src='/images/yellow.png' id='divOpacity0'/></div>
+<div class='visibilityHidden composited'><img src='/images/yellow.png' id='divVisibilityHidden'/></div>
+<div class='displayNone composited'><img src='/images/yellow.png' id='divDisplayNone'/></div>
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-2.html b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-2.html
new file mode 100644
index 00000000000..8ab32ebb1f2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited-2.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<title>Largest Contentful Paint: invisible images are not observable</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/invisible-images.js"></script>
+<style>
+  .opacity0 {
+    opacity: 0;
+  }
+  .visibilityHidden {
+    visibility: hidden;
+  }
+  .displayNone {
+    display: none;
+  }
+  .composited {
+    will-change: transform;
+  }
+  img {
+    border: 2px solid black;
+    will-change: transform;
+  }
+</style>
+<div class='opacity0 composited'><img src='/images/yellow.png' id='divOpacity0'/></div>
+<div class='visibilityHidden composited'><img src='/images/yellow.png' id='divVisibilityHidden'/></div>
+<div class='displayNone composited'><img src='/images/yellow.png' id='divDisplayNone'/></div>
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited.html b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited.html
deleted file mode 100644
index f652180d464..00000000000
--- a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML>
-<meta charset=utf-8>
-<head>
-<title>Largest Contentful Paint: invisible images are not observable</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<style>
-  .opacity0 {
-    opacity: 0;
-  }
-  .visibilityHidden {
-    visibility: hidden;
-  }
-  .displayNone {
-    display: none;
-  }
-  .composited {
-    will-change: transform;
-  }
-</style>
-</head>
-<body>
-<script>
-  async_test(t => {
-    assert_precondition(window.LargestContentfulPaint, "LargestContentfulPaint is not implemented");
-    const observer = new PerformanceObserver(
-      t.step_func(entryList => {
-        entryList.getEntries().forEach(entry => {
-          // May receive a text entry. Ignore that entry.
-          if (!entry.url) {
-            return;
-          }
-          // The images should not have caused an entry, so fail test.
-          assert_unreached('Should not have received an entry! Received one with id '
-              + entryList.getEntries()[0].id);
-        });
-      })
-    );
-    observer.observe({type: 'largest-contentful-paint', buffered: true});
-    // Images have been added but should not cause entries to be dispatched.
-    // Wait for 500ms and end test, ensuring no entry was created.
-    t.step_timeout(() => {
-      t.done();
-    }, 500);
-  }, 'Images with opacity: 0, visibility: hidden, or display: none are not observable by LargestContentfulPaint.');
-</script>
-<img src='/images/blue.png' class='opacity0 composited' id='opacity0'/>
-<img src='/images/green.png' class='visibilityHidden composited' id='visibilityHidden'/>
-<img src='/images/red.png' class='displayNone composited' id='displayNone'/>
-<div class='opacity0 composited'><img class='composited' src='/images/yellow.png' id='divOpacity0'/></div>
-<div class='visibilityHidden composited'><img class='composited' src='/images/yellow.png' id='divVisibilityHidden'/></div>
-<div class='displayNone composited'><img src='/images/yellow.png' id='divDisplayNone'/></div>
-<div class='opacity0 composited'><img src='/images/yellow.png' id='divOpacity0Composited'/></div>
-<div class='visibilityHidden composited'><img src='/images/yellow.png' id='divVisibilityHiddenComposited'/></div>
-<div class='displayNone composited'><img src='/images/yellow.png' id='divDisplayNoneComposited'/></div>
-</body>
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images.html b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images.html
index 49324663f22..997d70f7773 100644
--- a/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images.html
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images.html
@@ -1,9 +1,8 @@
 <!DOCTYPE HTML>
-<meta charset=utf-8>
-<head>
 <title>Largest Contentful Paint: invisible images are not observable</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/invisible-images.js"></script>
 <style>
   .opacity0 {
     opacity: 0;
@@ -15,36 +14,9 @@
     display: none;
   }
 </style>
-</head>
-<body>
-<script>
-  async_test(t => {
-    assert_precondition(window.LargestContentfulPaint, "LargestContentfulPaint is not implemented");
-    const observer = new PerformanceObserver(
-      t.step_func(entryList => {
-        entryList.getEntries().forEach(entry => {
-          // May receive a text entry. Ignore that entry.
-          if (!entry.url) {
-            return;
-          }
-          // The images should not have caused an entry, so fail test.
-          assert_unreached('Should not have received an entry! Received one with id '
-              + entryList.getEntries()[0].id);
-        });
-      })
-    );
-    observer.observe({type: 'largest-contentful-paint', buffered: true});
-    // Images have been added but should not cause entries to be dispatched.
-    // Wait for 500ms and end test, ensuring no entry was created.
-    t.step_timeout(() => {
-      t.done();
-    }, 500);
-  }, 'Images with opacity: 0, visibility: hidden, or display: none are not observable by LargestContentfulPaint.');
-</script>
 <img src='/images/blue.png' class='opacity0' id='opacity0'/>
 <img src='/images/green.png' class='visibilityHidden' id='visibilityHidden'/>
 <img src='/images/red.png' class='displayNone' id='displayNone'/>
 <div class='opacity0'><img src='/images/yellow.png' id='divOpacity0'/></div>
 <div class='visibilityHidden'><img src='/images/yellow.png' id='divVisibilityHidden'/></div>
 <div class='displayNone'><img src='/images/yellow.png' id='divDisplayNone'/></div>
-</body>
diff --git a/tests/wpt/web-platform-tests/largest-contentful-paint/resources/invisible-images.js b/tests/wpt/web-platform-tests/largest-contentful-paint/resources/invisible-images.js
new file mode 100644
index 00000000000..fd13e9454de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/largest-contentful-paint/resources/invisible-images.js
@@ -0,0 +1,22 @@
+async_test(t => {
+  assert_precondition(window.LargestContentfulPaint, "LargestContentfulPaint is not implemented");
+  const observer = new PerformanceObserver(
+    t.step_func(entryList => {
+       entryList.getEntries().forEach(entry => {
+       // May receive a text entry. Ignore that entry.
+        if (!entry.url) {
+          return;
+        }
+        // The images should not have caused an entry, so fail test.
+        assert_unreached('Should not have received an entry! Received one with id '
+            + entryList.getEntries()[0].id);
+      });
+    })
+  );
+  observer.observe({type: 'largest-contentful-paint', buffered: true});
+  // Images have been added but should not cause entries to be dispatched.
+  // Wait for 500ms and end test, ensuring no entry was created.
+  t.step_timeout(() => {
+    t.done();
+  }, 500);
+}, 'Images with opacity: 0, visibility: hidden, or display: none are not observable by LargestContentfulPaint.');
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html
index 5dd040badc6..2352c629f5d 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html
@@ -6,36 +6,53 @@
 <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#css-styling">
 <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#the-top-level-math-element">
 <meta name="assert" content="Verify default values for the tabIndex attribute">
+
+<script src="/mathml/support/mathml-fragments.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
   <div id="log"></div>
   <math>
-    <mrow id="mrow" onfocus="alert('fail')"></mrow>
-    <mrow id="mrow-link" href="javascript:alert('fail')" onfocus="alert('fail')"></mrow>
   </math>
   <script>
+    const htmlLinkableElements =
+      new Set([
+        'mi', 'mo', 'mn', 'ms', 'mtext', 'mrow'
+      ]);
+
+    Object.keys(MathMLFragments).forEach(elName => {
+        const mathEl = document.querySelector('math');
+
+        mathEl.innerHTML = `
+        <${elName} id="el" onfocus="alert('fail')"></${elName}>
+        <${elName} id="el-link" href="javascript:alert('fail')" onfocus="alert('fail')"></${elName}>
+        `;
+
+        const el = mathEl.querySelector('#el');
+        const elLink = mathEl.querySelector('#el-link');
+
+        const expectedDefault = (htmlLinkableElements.has(elName)) ? 0 : -1;
+
         test(() => {
-            const mrow = document.getElementById('mrow');
-            assert_equals(mrow.tabIndex, 0, "no attribute");
-            mrow.setAttribute("tabindex", "invalid");
-            assert_equals(mrow.getAttribute("tabindex"), "invalid");
-            assert_equals(mrow.tabIndex, 0, "invalid");
-            mrow.setAttribute("tabindex", "9999999999");
-            assert_equals(mrow.getAttribute("tabindex"), "9999999999");
-            assert_equals(mrow.tabIndex, 0, "too large integer");
-        }, "default and invalid values on mrow");
+            assert_equals(el.tabIndex, expectedDefault, "no attribute");
+            el.setAttribute("tabindex", "invalid");
+            assert_equals(el.getAttribute("tabindex"), "invalid");
+            assert_equals(el.tabIndex, expectedDefault, "invalid");
+            el.setAttribute("tabindex", "9999999999");
+            assert_equals(el.getAttribute("tabindex"), "9999999999");
+            assert_equals(el.tabIndex, expectedDefault, "too large integer");
+        }, `default and invalid values for ${elName} without href`);
         test(() => {
-            const mrowLink = document.getElementById('mrow-link');
-            assert_equals(mrow.tabIndex, 0, "no attribute");
-            mrow.setAttribute("tabindex", "invalid");
-            assert_equals(mrow.getAttribute("tabindex"), "invalid");
-            assert_equals(mrow.tabIndex, 0, "invalid");
-            mrow.setAttribute("tabindex", "9999999999");
-            assert_equals(mrow.getAttribute("tabindex"), "9999999999");
-            assert_equals(mrow.tabIndex, 0, "too large integer");
-        }, "default and invalid values on MathML link");
+            assert_equals(elLink.tabIndex, expectedDefault, "no attribute");
+            elLink.setAttribute("tabindex", "invalid");
+            assert_equals(elLink.getAttribute("tabindex"), "invalid");
+            assert_equals(elLink.tabIndex, expectedDefault, "invalid");
+            elLink.setAttribute("tabindex", "9999999999");
+            assert_equals(elLink.getAttribute("tabindex"), "9999999999");
+            assert_equals(elLink.tabIndex, expectedDefault, "too large integer");
+        }, `default and invalid values for ${elName} with href`);
+    });
   </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html
index df4b47add2b..040c611834e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,7 +75,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -120,8 +120,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html
index c551999a35a..3103c00962f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html
index 5c437feab5f..d5c5d86fec9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.http-rp/opt-in/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html
index 4dae0e9fa4d..e9953505ea0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/fetch.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html
index b5f22ac32cc..cf0d0afaf09 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/websocket.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html
index 028bdaace3e..930816e3910 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html
index d8b6f13b919..7c3009e4b9c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -76,7 +76,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html
index c551999a35a..3103c00962f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html
index 9682f5b78a1..d67d3dfbc1b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html
index 52a9fe92ec3..31550a1378b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,7 +53,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -78,8 +78,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,11 +95,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -137,12 +137,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -158,7 +158,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -182,9 +182,9 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -200,12 +200,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -221,7 +221,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html
index 82e9516d076..e259b1dccec 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -56,8 +56,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html
index 44f3573509a..d14a58c1189 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -163,7 +163,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -179,12 +179,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -200,12 +200,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -221,7 +221,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html
index 021a07c3dad..41a7a328d7b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -91,7 +91,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html
index 0dca9c615a7..825f9b105cd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html
index b7553720a15..f2590c6ecd1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html
index b0488bd5182..928365fd34a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html
index 8a2b8707056..d04a361ee8e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html
index cebddabe625..6c5090f2c41 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -101,11 +101,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html
index c5288a9a539..037f931626d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html
index 24e56cd69a3..2fbfc48915f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html
index 0ad1cb82158..853bc1270bc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/xhr.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html
index 55a31cf937d..14c3103fe5f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -76,7 +76,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -104,8 +104,8 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html
index 8a2b8707056..d04a361ee8e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html
index 83a4689d70b..68e2a490cc6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -101,11 +101,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html
index 47a0d5d7961..2a13933ff99 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/fetch.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,7 +53,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -78,8 +78,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -137,12 +137,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -158,11 +158,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -179,12 +179,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -200,12 +200,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -221,7 +221,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html
index 172b68ac2aa..3486ab38892 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,11 +32,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -53,11 +53,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html
index 49a8090c3ce..bd9395bdbbc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -32,11 +32,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -137,12 +137,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -158,12 +158,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -179,12 +179,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -200,12 +200,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -221,7 +221,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html
index 9654df0bf03..8f31ab2d19a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/fetch.https.html
@@ -14,8 +14,23 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +60,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -104,24 +119,9 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "source_scheme": "https",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html
index 211107c3700..5eb627c7cfb 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html
index 4905587b0f6..2ebeed08a0a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html
index d25c2ed666b..599f8eb9b5e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html
index 61c37b7a556..b09f6332ddd 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html
index 3269f5f3739..508a9d2bd79 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/fetch.https.html
@@ -14,54 +14,64 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,13 +85,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -94,24 +104,14 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html
index 4f37489aab1..eda0043651c 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html
index 7d1ec353f95..237ec0ca782 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html
index d4e4580fe37..0efd1429a77 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html
@@ -14,24 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -85,33 +85,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html
index 9706dd21b77..6bc8f75f652 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html
index baaf0a857b7..088c6c410a2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html
@@ -14,64 +14,64 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -85,33 +85,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html
index 16665997065..d806e9c0bc8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html
index 0beaaeeb128..896c0297d5f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html
index 1da38318f41..2784b2bf13e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html
@@ -14,34 +14,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,63 +55,63 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html
index 75c8623fe10..1a371ce028f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html
index c03abe08385..ff176ab6d1f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/video-tag.https.html
@@ -14,54 +14,54 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -85,33 +85,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html
index 1bacd28b99a..49b80c448f7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/websocket.https.html
@@ -14,34 +14,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html
index 36aeee17649..2717be37ccf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic.https.html
@@ -14,24 +14,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "worker-classic",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -44,14 +34,24 @@
             "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-classic",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html
index 8a7cfb38dac..a44eee04689 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data.https.html
@@ -14,74 +14,74 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -94,24 +94,24 @@
             "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html
index 9ac91e94e03..6cf33d54f5f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html
index e53a0cf2283..165cbf6d14d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data.https.html
@@ -14,24 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,73 +45,73 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html
index de8f9d1c4ee..67926809f28 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation.https.html
@@ -14,54 +14,54 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,43 +75,43 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html
index fd9287d6f3e..72ebea2ff2d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html
index c3603607656..3c31d0d9983 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio.https.html
@@ -14,104 +14,104 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html
index 476b70c1fee..ae84f3d1ef8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data.https.html
@@ -14,34 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,13 +65,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,13 +85,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -94,24 +104,14 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "worklet-layout-import-data",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html
index 6aeb702b379..8a39e2d9d32 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout.https.html
@@ -14,24 +14,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,13 +65,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,43 +85,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "worklet-layout",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and keep-scheme redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html
index 42644b34f4c..918051440e2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data.https.html
@@ -14,64 +14,64 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -85,33 +85,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html
index b8e30a65ad6..c270a2b70ad 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -65,23 +65,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -94,24 +94,24 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html
index 93975e2d692..22f4aa06b53 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/xhr.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -65,53 +65,53 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html
index b4bf5f4f1e4..9734cef5c54 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/audio-tag.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon.https.html
index 45dec1af776..87442befd3f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/beacon.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch.https.html
index d7ae8c8532a..45378cae4a1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/fetch.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html
index 0e9ff596aa6..8c2486d9a72 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/img-tag.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html
index 73cf23ab72f..2014c10e230 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-css-tag.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html
index 7fa4d088b05..456139afdaa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html
index 215fcbc1bc0..209927d53f1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/object-tag.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html
index 279c128fc8f..d28777b8cb7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/picture-tag.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html
index 436bb1cdfb7..55e2dadb067 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/script-tag.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html
index caa080b3a2f..02c50e3bcb6 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic.https.html
@@ -15,24 +15,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html
index f1b8ce8a40c..d906686d927 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-import-data.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html
index 82067e48620..2ebb2319314 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module.https.html
@@ -15,24 +15,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html
index 19ffe51d837..6b40dfc2e69 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/video-tag.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for video-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for video-tag to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket.https.html
index af220599359..b54656dbe74 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/websocket.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html
index 2d374e6fef4..ca7667ceef3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic.https.html
@@ -15,24 +15,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html
index 3b163fc29e7..2ff9aa7cf2a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-import-data.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html
index 4e1c26bf38a..2f1c240cae9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module.https.html
@@ -15,24 +15,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html
index 40909c4fdd8..0ebc71607fa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html
index 337df6cee8b..b3b070b60ba 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-animation.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html
index 3496f7d64a1..383e08f0d94 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html
index 6a124225d36..c4caffa7c5e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-audio.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html
index 4ef290efd37..b90abff5127 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data.https.html
@@ -15,14 +15,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,14 +35,14 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html
index 19dfe3e93b7..08f5bcc66ed 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-layout.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html
index 0883c6280bd..04176e561d7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html
index 896ffc83cc0..8c58fc638f4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worklet-paint.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr.https.html
index 0a34b9035fb..22cbcd7ed0b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/xhr.https.html
@@ -15,34 +15,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag.https.html
index 822561fe53e..75c9b753557 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/audio-tag.https.html
@@ -16,82 +16,82 @@
           {
             "expectation": "allowed",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "audio-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon.https.html
index a08a18944cb..ae29a64f41f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/beacon.https.html
@@ -14,34 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "beacon",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,13 +45,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -74,24 +64,34 @@
             "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "beacon",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "beacon",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects blocked for beacon to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch.https.html
index 034043c56ca..1250aec2a8d 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/fetch.https.html
@@ -14,24 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,53 +45,53 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag.https.html
index 46039be2d38..c02bf8b69ce 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/img-tag.https.html
@@ -15,43 +15,43 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -65,33 +65,33 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html
index 3e75c7884a4..559e0223c04 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-css-tag.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-css-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html
index 57b81f21a04..5a0364121e9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/link-prefetch-tag.https.html
@@ -14,54 +14,54 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -74,24 +74,24 @@
             "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "link-prefetch-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag.https.html
index 8f606cbda48..e22e783950b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/object-tag.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for object-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "object-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for object-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for object-tag to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag.https.html
index e6eaeec7fc7..432ab7eaa33 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/picture-tag.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "picture-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag.https.html
index ff3d6b9e786..3cd5eb3a34e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/script-tag.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for script-tag to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html
index 0beaaeeb128..896c0297d5f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html
index 6ef7ff8ce78..afc248529b0 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-import-data.https.html
@@ -14,24 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -46,22 +46,22 @@
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -74,24 +74,24 @@
             "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-import-data to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html
index 75c8623fe10..1a371ce028f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for sharedworker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for sharedworker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag.https.html
index fef50b70ada..56c9a4cf5aa 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/video-tag.https.html
@@ -16,22 +16,22 @@
           {
             "expectation": "allowed",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,13 +45,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -66,12 +66,12 @@
           {
             "expectation": "allowed",
             "origin": "same-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "video-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for video-tag to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for video-tag to same-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket.https.html
index 1bacd28b99a..49b80c448f7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/websocket.https.html
@@ -14,34 +14,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic.https.html
index 2e456cef185..2717be37ccf 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic.https.html
@@ -14,44 +14,44 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html
index 3910434a3a8..ae559b90e9a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-import-data.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-import-data to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module.https.html
index 49ba4d5f205..6cf33d54f5f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module.https.html
@@ -14,24 +14,14 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "worker-module",
-            "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -44,14 +34,24 @@
             "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worker-module",
+            "subresource_policy_deliveries": [],
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html
index b8ff50d3fb5..77fdf272d12 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html
index cc4f9f2399b..64d00ddd5b7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-animation.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-animation to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html
index eb07e921632..faa0c457fa7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html
index 1c0f12d8faa..7151f534de3 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-audio.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-audio to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html
index c0a964c03b9..da7c9a797e9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data.https.html
@@ -14,24 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,23 +45,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -74,24 +74,24 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html
index 66248820afa..f2335d35ae7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-layout.https.html
@@ -14,54 +14,54 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -74,24 +74,24 @@
             "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-layout to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html
index f0cdddf1263..5c1970599d7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html
index 83146d6247e..77cf29176c1 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worklet-paint.https.html
@@ -14,84 +14,84 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worklet-paint to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worklet-paint to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr.https.html
index 728c685924f..0f164b4077e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/xhr.https.html
@@ -14,24 +14,24 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,43 +55,43 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html
index 9cae4dbc1da..d2b13b27346 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -90,8 +90,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html
index 5433c76d9c6..01263c9ee6a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html
index bd5c73caf3c..71ee538072e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -76,7 +76,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -134,9 +134,9 @@
             "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html
index d3591afb1b6..e8693e4fef8 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html
index 4917ad091ed..af1d8362509 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/websocket.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html
index ec927016075..e8a86f79e7e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/opt-in/xhr.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html
index 952c9e9a114..da5a674c543 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/fetch.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -76,7 +76,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html
index 5433c76d9c6..01263c9ee6a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html
index 3bb7ec52173..431e05aa504 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-data.meta/unset/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch.https.html
index f0538f1a09c..a89d066c9f7 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket.https.html
index c483e2a0655..ebfb71e2f85 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic.https.html
index 36ec2a61dad..e5f825d5778 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-classic.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module.https.html
index 05342727efe..f10998e3f00 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/worker-module.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr.https.html
index 031458808b4..863aa62d05e 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.http-rp/opt-in/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -90,8 +90,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,7 +116,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -134,9 +134,9 @@
             "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch.https.html
index 4f579fd3f9b..2dfd32d0ed9 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/fetch.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket.https.html
index 3e794b3136b..76ba9806710 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/websocket.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic.https.html
index 95d529e0e4e..0de01f79b8b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-classic.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module.https.html
index 5783e636ad0..32f4762c438 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/worker-module.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr.https.html
index 888597dafc3..dd7305e4233 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/opt-in/xhr.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/fetch.https.html
index d8b742c574a..713df3085ff 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,11 +53,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -137,12 +137,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -158,12 +158,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -179,7 +179,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/websocket.https.html
index 486b9c95f60..4357a444570 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -56,8 +56,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic.https.html
index bd78a5b6efd..5dde9baae5b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-classic.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,7 +95,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module.https.html
index 9e54a72a143..6672e464a3f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/worker-module.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -32,11 +32,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,7 +95,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/xhr.https.html
index fc51681a647..c6e0211aded 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-classic-inherit.meta/unset/xhr.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -137,12 +137,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -158,12 +158,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -179,7 +179,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html
index 2860fcaec57..90cfde36181 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -121,7 +121,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html
index 498935b0f06..a202f1af21a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html
index 8a1163d1f05..1e26f150a64 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.http-rp/opt-in/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-https",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -76,7 +76,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -105,8 +105,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,7 +116,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -134,9 +134,9 @@
             "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html
index 74f36e42d2f..8ed388b1e7a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/fetch.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html
index 248bb61badf..ba6c0144396 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/websocket.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html
index 056e48a8e57..808e6b6f5a4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/opt-in/xhr.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html
index 6d7ceaaa12f..1a04af86788 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -104,8 +104,8 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html
index 498935b0f06..a202f1af21a 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -44,8 +44,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html
index a2b5d178024..da805020845 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-data.meta/unset/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch.https.html
index 9c8378953da..8eec2b41490 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -90,8 +90,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket.https.html
index 2a6db7c1188..220c21c4111 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-ws",
+            "origin": "cross-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic.https.html
index d9e46d2a25f..9619ce4cd75 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-classic.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module.https.html
index cc438d8f8aa..d6e28445e09 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/worker-module.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr.https.html
index ed371b7c157..69aa3499ce2 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.http-rp/opt-in/xhr.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -101,12 +101,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch.https.html
index 5660bf59137..f6fc93a6b8f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/fetch.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket.https.html
index f6563925c4f..cbfc485b152 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/websocket.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,8 +45,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic.https.html
index fae263e9af4..01512ff49bc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-classic.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module.https.html
index 6a0d14b4a48..89fe1d60fbe 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/worker-module.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr.https.html
index f960502457d..3425ccfb552 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/opt-in/xhr.https.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/fetch.https.html
index 91305554a24..383f923317b 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/fetch.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,11 +74,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -137,11 +137,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -158,12 +158,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -179,7 +179,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/websocket.https.html
index d9565d0ecdc..0e7c357ae22 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/websocket.https.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-ws",
+            "expectation": "allowed",
+            "origin": "same-wss",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -56,8 +56,8 @@
             "test_description": "Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-wss",
+            "expectation": "blocked",
+            "origin": "same-ws",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic.https.html
index 86885c1082f..e8eba008f9f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-classic.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,11 +53,11 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -74,11 +74,11 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -95,7 +95,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-module.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-module.https.html
index b69bda02dea..f4348836ad4 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/worker-module.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,11 +53,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -74,11 +74,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -95,7 +95,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/xhr.https.html
index 54a64915a6a..93c5b002edc 100644
--- a/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/mixed-content/gen/worker-module-inherit.meta/unset/xhr.https.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,7 +95,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -121,7 +121,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "swap-scheme",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -137,11 +137,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -158,12 +158,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -179,7 +179,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context."
+            "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html
new file mode 100644
index 00000000000..f03f98abe06
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_node_in_shadow_dom.html
@@ -0,0 +1,128 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Lostpointercapture fires on document when target in shadow dom  is removed</title>
+    <meta name="viewport" content="width=device-width">
+    <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=810882">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+  </head>
+  <body onload="onLoad()">
+    <template id="template">
+      <style>
+          #content{
+              height:100px;
+              width:100px;
+              background-color: lightgrey;
+          }
+      </style>
+      <div id="content"></div>
+    </template>
+    <h1>Pointer Events - lostpointercapture when capturing element in shadow dom is removed</h1>
+    <h4>
+        Test Description:
+        This test checks if lostpointercapture is fired at the document when the capturing node that is in shadow dom is removed from the shadow dom.
+        Complete the following actions:
+        <ol>
+            <li>Press left mouse button over "Set Capture" button. Pointer should be captured by the gray rectangle which is in shadow dom.</li>
+            <li>Gray rectangle will be removed from shadow dom.</li>
+            <li>"lostpointercapture" should be received on the document not on the gray rectangle.</li>
+        </ol>
+    </h4>
+    <div id="shadowhost"></div>
+    <br>
+    <input type="button" id="btnCapture" value="Set Capture">
+    <div id="log"></div>
+    <script>
+      var logDiv = document.getElementById("log");
+      function logMessage(message){
+        var log = document.createElement("div");
+        var messageNode = document.createTextNode(message);
+        log.appendChild(messageNode);
+        logDiv.appendChild(log);
+      }
+      var events = [];
+
+      var host = document.getElementById("shadowhost");
+      var shadowRoot = host.attachShadow({mode: "open"});
+      var template = document.getElementById("template");
+      var node = template.content.cloneNode(true);
+      shadowRoot.appendChild(node);
+
+      var content = host.shadowRoot.getElementById("content");
+      var captureButton = document.getElementById("btnCapture");
+
+      captureButton.addEventListener("pointerdown", function(event){
+        logMessage("Pointer will be captured by the shadow dom gray rectangle.");
+        content.setPointerCapture(event.pointerId);
+        events.push("pointerdown@captureButton");
+      });
+      content.addEventListener("gotpointercapture", function(event){
+        logMessage("Gray rectangle received pointercapture.");
+        logMessage("Removing gray rectangle from shadow dom.")
+        content.parentNode.removeChild(content);
+        events.push("gotpointercapture@content");
+      });
+      content.addEventListener("lostpointercapture", function(event){
+        logMessage("Test Failed! The element removed from shadow dom should not receive lostpointercapture.")
+        events.push("lostpointercapture@content");
+        if(window.promise_test && shadow_dom_test){
+          shadow_dom_test.step(function(){
+            assert_unreached("lostpointercapture must be fired on the document, not the capturing element");
+            reject_test("lostpointercapture must not be dispatched on the disconnected node");
+            shadow_dom_test.done();
+          });
+        }
+      });
+      document.addEventListener("lostpointercapture", function(event){
+        logMessage("Test Passed! Document received lostpointercapture.");
+        events.push("lostpointercapture@document");
+        if(window.promise_test && shadow_dom_test){
+          shadow_dom_test.step(function(){
+            assert_array_equals(events, ["pointerdown@captureButton",
+              "gotpointercapture@content",
+              "lostpointercapture@document"]);
+            resolve_test();
+            shadow_dom_test.done();
+          });
+        }
+      });
+
+      var shadow_dom_test = null;
+      var resolve_test = null;
+      var reject_test = null;
+
+      function cleanup(){
+        events = [];
+        shadow_dom_test = null;
+        resolve_test = null;
+        reject_test = null;
+      }
+
+      function onLoad(){
+        if(window.promise_test){
+          promise_test(function(t){
+            return new Promise(function(resolve, reject){
+              shadow_dom_test = t;
+              resolve_test = resolve;
+              reject_test = reject;
+              t.add_cleanup(function(){
+                cleanup();
+              });
+              var actions = new test_driver.Actions();
+              var actions_promise = actions
+                  .pointerMove(0, 0, {origin:captureButton})
+                  .pointerDown({button: actions.ButtonType.LEFT})
+                  .pointerUp({button: actions.ButtonType.LEFT})
+                  .send();
+            });
+          }, "lostpointercapture is dispatched on the document when shadow dom capturing element is removed");
+        }
+      }
+    </script>
+  </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html
new file mode 100644
index 00000000000..4b5c9f6eae8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_lostpointercapture_for_disconnected_shadow_host.html
@@ -0,0 +1,136 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Lostpointercapture fires on document when target in shadow dom  is removed</title>
+    <meta name="viewport" content="width=device-width">
+    <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=810882">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <style>
+      #shadowhost{
+        height:200px;
+        width:200px;
+        background-color:magenta;
+      }
+    </style>
+  </head>
+  <body onload="onLoad()">
+    <template id="template">
+      <style>
+          #content{
+              height:100px;
+              width:100px;
+              background-color: lightgrey;
+          }
+      </style>
+      <div id="content"></div>
+    </template>
+    <h1>Pointer Events - lostpointercapture when capturing element in shadow dom is removed by removing the shadow host</h1>
+    <h4>
+        Test Description:
+        This test checks if lostpointercapture is fired at the document when the capturing node is removed from the document by removing the shadow host.
+        The shadow host is colored magenta and the shadow dom element is colored gray.
+        Complete the following actions:
+        <ol>
+            <li>Press left mouse button over "Set Capture" button. Pointer should be captured by the gray rectangle.</li>
+            <li>Shadow host magenta rectangle including the gray rectangle will be removed from shadow dom.</li>
+            <li>"lostpointercapture" should be received on the document not on the gray rectangle.</li>
+        </ol>
+    </h4>
+    <div id="shadowhost"></div>
+    <br>
+    <input type="button" id="btnCapture" value="Set Capture">
+    <div id="log"></div>
+    <script>
+      var logDiv = document.getElementById("log");
+      function logMessage(message){
+        var log = document.createElement("div");
+        var messageNode = document.createTextNode(message);
+        log.appendChild(messageNode);
+        logDiv.appendChild(log);
+      }
+      var events = [];
+
+      var host = document.getElementById("shadowhost");
+      var shadowRoot = host.attachShadow({mode: "open"});
+      var template = document.getElementById("template");
+      var node = template.content.cloneNode(true);
+      shadowRoot.appendChild(node);
+
+      var content = host.shadowRoot.getElementById("content");
+      var captureButton = document.getElementById("btnCapture");
+
+      captureButton.addEventListener("pointerdown", function(event){
+        logMessage("Pointer will be captured by the shadow dom gray rectangle.");
+        content.setPointerCapture(event.pointerId);
+        events.push("pointerdown@captureButton");
+      });
+      content.addEventListener("gotpointercapture", function(event){
+        logMessage("Gray rectangle received pointercapture.");
+        logMessage("Removing magenta rectangle (which includes gray rectangle) from shadow dom.")
+        host.parentNode.removeChild(host);
+        events.push("gotpointercapture@content");
+      });
+      content.addEventListener("lostpointercapture", function(event){
+        logMessage("Test Failed! The element removed from shadow dom should not receive lostpointercapture.")
+        events.push("lostpointercapture@content");
+        if(window.promise_test && shadow_dom_test){
+          shadow_dom_test.step(function(){
+            assert_unreached("lostpointercapture must be fired on the document, not the capturing element");
+            reject_test("lostpointercapture must not be dispatched on the disconnected node");
+            shadow_dom_test.done();
+          });
+        }
+      });
+      document.addEventListener("lostpointercapture", function(event){
+        logMessage("Test Passed! Document received lostpointercapture.");
+        events.push("lostpointercapture@document");
+        if(window.promise_test && shadow_dom_test){
+          shadow_dom_test.step(function(){
+            assert_array_equals(events, ["pointerdown@captureButton",
+              "gotpointercapture@content",
+              "lostpointercapture@document"]);
+            resolve_test();
+            shadow_dom_test.done();
+          });
+        }
+      });
+
+      var shadow_dom_test = null;
+      var resolve_test = null;
+      var reject_test = null;
+
+      function cleanup(){
+        events = [];
+        shadow_dom_test = null;
+        resolve_test = null;
+        reject_test = null;
+      }
+
+      function onLoad(){
+        if(window.promise_test){
+          promise_test(function(t){
+            return new Promise(function(resolve, reject){
+              shadow_dom_test = t;
+              resolve_test = resolve;
+              reject_test = reject;
+              t.add_cleanup(function(){
+                cleanup();
+              });
+              var actions = new test_driver.Actions();
+              var actions_promise = actions
+                  .pointerMove(0, 0, {origin:captureButton})
+                  .pointerDown({button: actions.ButtonType.LEFT})
+                  .pointerUp({button: actions.ButtonType.LEFT})
+                  .send();
+            });
+          }, "lostpointercapture is dispatched on the document when shadow host is removed");
+        }
+      }
+    </script>
+  </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-custom-element.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-custom-element.html
new file mode 100644
index 00000000000..e8f143b309f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-custom-element.html
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>PointerCapture for Custome Shadow DOM</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width">
+    <link rel="help" href= "https://bugs.chromium.org/p/chromium/issues/detail?id=810882">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script>
+       class WC extends HTMLElement{
+        constructor(){
+          super();
+          let template = document.getElementById('template-wc');
+          let node = template.content.cloneNode(true) ;
+
+          let shadowRoot = this.attachShadow({mode: 'open'});
+          shadowRoot.appendChild(node);
+        }
+       }
+       customElements.define("wc-wc", WC);
+    </script>
+    </head>
+  <body onload="onLoad()">
+    <template id="template-wc">
+      <style>
+          #content{
+              height:50px;
+              width:50px;
+              background-color: magenta;
+          }
+      </style>
+      <div id="content"></div>
+    </template>
+    <h4>PointerCapture by Custom Element's Shadow DOM</h4>
+      The magenta box below is part of a custom element's Shadow DOM.
+    <ul>
+      <li> Click left mouse button inside the box and keep mouse button depressed</li>
+      <li> Move the mouse</li>
+      <li> There should be a message stating <em>Pointer was captured by custom element's Shadow DOM!</em></li>
+      <li> Release left mouse button</li>
+      <li> There should be a message stating <em>Pointer was released by custom element's Shadow DOM!</em></li>
+    </ul>
+
+    <wc-wc id="wc-wc"></wc-wc>
+    <div id="log"></div>
+    <script>
+      var logDiv = document.getElementById("log");
+      function logMessage(message){
+        var log = document.createElement("div");
+        var messageNode = document.createTextNode(message);
+        log.appendChild(messageNode);
+        logDiv.appendChild(log);
+      }
+      var events = [];
+
+      var content = document.getElementById("wc-wc")
+         .shadowRoot.getElementById("content");
+
+      content.addEventListener("pointerdown", function(e){
+        content.setPointerCapture(e.pointerId);
+        events.push("pointerdown@content");
+      });
+      content.addEventListener("gotpointercapture", function(e){
+        logMessage("Pointer was captured by custom element's Shadow DOM!");
+        events.push("gotpointercapture@content");
+      });
+      content.addEventListener("pointerup", function(e){
+        content.releasePointerCapture(e.pointerId);
+        events.push("pointerup@content");
+      });
+      content.addEventListener("lostpointercapture", function(e){
+        logMessage("Pointer was released by custom element's Shadow DOM!");
+        events.push("lostpointercapture@content");
+        if(window.promise_test && wc_shadow_dom_test){
+          wc_shadow_dom_test.step(function(){
+            assert_array_equals(events, ["pointerdown@content",
+              "gotpointercapture@content", "pointerup@content",
+              "lostpointercapture@content"]);
+            resolve_test();
+            wc_shadow_dom_test.done();
+          });
+        }
+      });
+
+      var wc_shadow_dom_test = null;
+      var resolve_test = null;
+      var reject_test = null;
+
+      function cleanup(){
+        events = [];
+        shadow_dom_test = null;
+        resolve_test = null;
+        reject_test = null;
+      }
+
+      function onLoad(){
+        if(window.promise_test){
+          promise_test(function(t){
+            return new Promise(function(resolve, reject){
+              wc_shadow_dom_test = t;
+              resolve_test = resolve;
+              reject_test = reject;
+              t.add_cleanup(function(){
+                cleanup();
+              });
+              var contentRect = content.getBoundingClientRect();
+              var actions = new test_driver.Actions();
+              var actions_promise = actions
+                  .pointerMove(contentRect.x, contentRect.y)
+                  .pointerDown({button: actions.ButtonType.LEFT})
+                  .pointerUp({button: actions.ButtonType.LEFT})
+                  .send();
+            });
+          }, "PointerCapture works for custom element Shadow DOM.");
+        }
+      }
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html
new file mode 100644
index 00000000000..8279665f97b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture-in-shadow-dom.html
@@ -0,0 +1,114 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>PointerCapture for Shadow DOM Elements</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width">
+    <link rel="help" href= "https://bugs.chromium.org/p/chromium/issues/detail?id=810882">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+  </head>
+  <body onload="onLoad()">
+    <template id="template">
+      <style>
+          #content{
+              height:100px;
+              width:100px;
+              background-color: lightgrey;
+          }
+      </style>
+      <div id="content"></div>
+    </template>
+    <h4>PointerCapture by Shadow DOM element</h4>
+    The light gray box below is part of Shadow DOM.
+    <ul>
+      <li> Click left mouse button inside the box and keep mouse button depressed </li>
+      <li> Move the mouse </li>
+      <li> There should be a message stating <em>Pointer was captured by Shadow DOM!</em></li>
+      <li> Release left mouse button
+      <li> There should be a message stating <em>Pointer was released by Shadow DOM!</em></li>
+    </ul>
+    <div id="shadowhost"></div>
+    <div id="log"></div>
+    <script>
+      var logDiv = document.getElementById("log");
+      function logMessage(message){
+        var log = document.createElement("div");
+        var messageNode = document.createTextNode(message);
+        log.appendChild(messageNode);
+        logDiv.appendChild(log);
+      }
+      var events = [];
+
+      var host = document.getElementById("shadowhost");
+      var shadowRoot = host.attachShadow({mode: "open"});
+      var template = document.getElementById("template");
+      var node = template.content.cloneNode(true);
+      shadowRoot.appendChild(node);
+
+      var content = host.shadowRoot.getElementById("content");
+
+      content.addEventListener("pointerdown", function(e){
+        content.setPointerCapture(e.pointerId);
+        events.push("pointerdown@content");
+      });
+      content.addEventListener("gotpointercapture", function(e){
+        logMessage("Pointer was captured by Shadow DOM!");
+        events.push("gotpointercapture@content");
+      });
+      content.addEventListener("pointerup", function(e){
+        content.releasePointerCapture(e.pointerId);
+        events.push("pointerup@content");
+      });
+      content.addEventListener("lostpointercapture", function(e){
+        logMessage("Pointer was released by Shadow DOM!");
+        events.push("lostpointercapture@content");
+        if(window.promise_test && shadow_dom_test){
+          shadow_dom_test.step(function(){
+            assert_array_equals(events, ["pointerdown@content",
+              "gotpointercapture@content", "pointerup@content",
+              "lostpointercapture@content"]);
+            resolve_test();
+            shadow_dom_test.done();
+          });
+        }
+      });
+
+      var shadow_dom_test = null;
+      var resolve_test = null;
+      var reject_test = null;
+
+      function cleanup(){
+        events = [];
+        shadow_dom_test = null;
+        resolve_test = null;
+        reject_test = null;
+      }
+
+      function onLoad(){
+        if(window.promise_test){
+          promise_test(function(t){
+            return new Promise(function(resolve, reject){
+              shadow_dom_test = t;
+              resolve_test = resolve;
+              reject_test = reject;
+              t.add_cleanup(function(){
+                cleanup();
+              });
+              var contentRect = content.getBoundingClientRect();
+              var actions = new test_driver.Actions();
+              var actions_promise = actions
+                  .pointerMove(contentRect.x, contentRect.y)
+                  .pointerDown({button: actions.ButtonType.LEFT})
+                  .pointerUp({button: actions.ButtonType.LEFT})
+                  .send();
+            });
+          }, "PointerCapture works for Shadow DOM element.");
+        }
+      }
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
index 7a52abfcb04..8f682e685a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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",
@@ -97,42 +97,42 @@
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
index 6890e3456d8..31111c3cce4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
@@ -17,52 +17,52 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -76,23 +76,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,33 +106,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
index 9e029dd3cec..5985002bc77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
@@ -16,16 +16,6 @@
         [
           {
             "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."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -36,33 +26,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,33 +76,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 keep-origin 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-http",
-            "redirection": "keep-origin",
+            "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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
index 3284b14cff3..4a62f71b44f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
@@ -17,102 +17,102 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
index 7c36ab3734e..95ef48cdbbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
index 77faf61f5b1..74334b36ccf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
index 8525ee2c023..569b0ac8e21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
index 7372c260437..e04c767ed5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
index 1d118d023b4..ca1042d6a6f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
index 1d7a1890834..6feb01bda6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
index b631db09f79..43642c590dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
index 522d74ed28c..0d35924ddd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
index 82ecb1461f5..7814f3492d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html
index 77faf61f5b1..74334b36ccf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html
index 522d74ed28c..0d35924ddd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html
index 82ecb1461f5..7814f3492d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/same-origin/xhr.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
index 77faf61f5b1..74334b36ccf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
index 7372c260437..e04c767ed5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index b631db09f79..43642c590dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html
index 47c6f86a454..2641813ea70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html
index 9b511a90b1f..8f682e685a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/fetch.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
+            "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 keep-origin 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",
@@ -96,43 +96,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html
index 5b196b97d78..31111c3cce4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/iframe-tag.http.html
@@ -16,33 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "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-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,43 +56,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "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 cross-https origin and swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
+          },
+          {
+            "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",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html
index 6cbecbcd0e5..5985002bc77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/img-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -37,42 +37,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,53 +86,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html
index 6473cf3ed00..4a62f71b44f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/script-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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",
+            "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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html
index b631db09f79..43642c590dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html
index b211b0aba44..95ef48cdbbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unsafe-url/xhr.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -47,12 +47,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,13 +66,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,23 +86,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
index e76f2828a22..2641813ea70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/a-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
index 559e6625dcd..8f682e685a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/fetch.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -36,83 +36,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
index c37ef9f5f2b..31111c3cce4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/iframe-tag.http.html
@@ -26,33 +26,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,73 +66,73 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
index 400a1a61b06..5985002bc77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/img-tag.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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",
@@ -96,23 +96,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
index 48e20a1fbd6..4a62f71b44f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/script-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,23 +46,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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",
@@ -76,13 +86,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,33 +116,23 @@
           },
           {
             "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-http",
-            "redirection": "keep-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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html
index b631db09f79..43642c590dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html
index 522d74ed28c..0d35924ddd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
index 31521e2af24..95ef48cdbbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.http-rp/unset/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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": "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
index 02a217ca4a1..ca14aa2021e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
@@ -27,23 +27,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
index fd37e90f6c1..30c1f6b7b3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
@@ -17,23 +17,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -47,93 +47,93 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
index 61ff8eba338..fddad739594 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -17,23 +17,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -57,83 +57,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
index a1dd667425a..fc9f4838528 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -18,82 +18,82 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -107,23 +107,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
index 6733f8da987..b49b75993d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -17,53 +17,53 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,23 +77,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -107,13 +107,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -127,13 +127,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
index 8f248777884..1ebfe2059a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
@@ -17,63 +17,63 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -97,33 +97,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
index 3eeacc5cd30..9a36013b9cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
index 2fcb8233b1c..51d2a157acb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
index ca2e54ea997..9d227d62940 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html
index d7d3a914365..3cdbc538f2c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/origin-when-cross-origin/xhr.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html
index be55f6567f6..c1bfe063975 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/fetch.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html
index caf9e4cd052..dc3e359db0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/iframe-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html
index 61c439ab73f..5e74d39b65f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/script-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html
index c95997bbc6b..b6d27e31b5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/sharedworker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html
index 20575af9d79..6090d396ee1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html
index d17ca46153c..bbf7a826253 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/same-origin/worker-module.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
index 0ed5cfeb3f2..25e1379e0dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
index 97dc6711c55..f61f8d67a0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
index a0b0bb783c0..81f54227d1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html
index a23aaec6c7b..93f874f51d7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/a-tag.http.html
@@ -17,43 +17,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html
index da471988708..73b2f579516 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/fetch.http.html
@@ -17,123 +17,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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 keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html
index a7eef16bc77..66b331a4f50 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/iframe-tag.http.html
@@ -17,123 +17,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html
index 350d6fac65f..9f59d065e94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/img-tag.http.html
@@ -18,122 +18,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html
index ce77afe15af..d09be02124f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/script-tag.http.html
@@ -17,93 +17,93 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -117,23 +117,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html
index 3bd51f722ba..f7ff65bd6b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html
index d59c06f0b84..48482da94f5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/worker-module.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html
index 2dd3da340ad..5496264121f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unsafe-url/xhr.http.html
@@ -17,13 +17,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -37,33 +37,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,63 +77,63 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
index e1a24a80980..2641813ea70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
index fd6c749e971..8f682e685a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/fetch.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
index e292a0cf2bc..31111c3cce4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/iframe-tag.http.html
@@ -17,42 +17,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -67,72 +67,72 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
index a2509f9f047..5985002bc77 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/img-tag.http.html
@@ -16,33 +16,33 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -57,6 +57,16 @@
           {
             "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",
@@ -97,12 +107,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +126,13 @@
           },
           {
             "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-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
index 4f4a79210f4..4a62f71b44f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/script-tag.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html
index 1d7a1890834..6feb01bda6d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html
index b631db09f79..43642c590dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html
index 522d74ed28c..0d35924ddd1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
index 2da993756a6..95ef48cdbbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K+1/gen/top.meta/unset/xhr.http.html
@@ -16,23 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin 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."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,33 +36,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,13 +76,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin 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",
@@ -106,33 +96,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
index 86f3190282c..d0cb7206f8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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",
@@ -97,42 +97,42 @@
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
index 6cda672ecab..fbb87846a7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
@@ -17,52 +17,52 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -76,23 +76,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,33 +106,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
index 59bcdb3c33e..1433505d9aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
@@ -16,16 +16,6 @@
         [
           {
             "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."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -36,33 +26,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,33 +76,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 keep-origin 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-http",
-            "redirection": "keep-origin",
+            "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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
index 5f7d210d0e8..0e7bad7b16d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
@@ -17,102 +17,102 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
index ba2a63edcf2..81df08c87e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
index fd8caf645b8..2b840d4aec5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
index b65aef9ce0d..cf605923b80 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
index 89e722798a6..111862a7dc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
index dc485678e76..abdb1951401 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
index e0d775cee1d..7365afae6f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
index 3f57cf8c807..2533e152165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
index 16665a4146f..8190dfcdd42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
index 6f09ea6b097..b0bcb0a901b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html
index fd8caf645b8..2b840d4aec5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html
index 16665a4146f..8190dfcdd42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html
index 6f09ea6b097..b0bcb0a901b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/same-origin/xhr.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
index fd8caf645b8..2b840d4aec5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
index 89e722798a6..111862a7dc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index 3f57cf8c807..2533e152165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html
index e6ba204e584..19c55517e84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html
index 61e09140e00..d0cb7206f8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/fetch.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
+            "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 keep-origin 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",
@@ -96,43 +96,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html
index e9ff9a1093c..fbb87846a7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/iframe-tag.http.html
@@ -16,33 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "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-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,43 +56,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "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 cross-https origin and swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
+          },
+          {
+            "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",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html
index 1df6d369660..1433505d9aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/img-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -37,42 +37,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,53 +86,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html
index bfb28f549d1..0e7bad7b16d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/script-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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",
+            "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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html
index 3f57cf8c807..2533e152165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html
index cef94764b50..81df08c87e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unsafe-url/xhr.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -47,12 +47,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,13 +66,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,23 +86,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
index 016e9b54131..19c55517e84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/a-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
index a2ca63a2bad..d0cb7206f8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/fetch.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -36,83 +36,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
index adeac7e1a5e..fbb87846a7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/iframe-tag.http.html
@@ -26,33 +26,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,73 +66,73 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
index 9591ce9bf6e..1433505d9aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/img-tag.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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",
@@ -96,23 +96,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
index 198d4f0eb05..0e7bad7b16d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/script-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,23 +46,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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",
@@ -76,13 +86,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,33 +116,23 @@
           },
           {
             "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-http",
-            "redirection": "keep-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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html
index 3f57cf8c807..2533e152165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html
index 16665a4146f..8190dfcdd42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
index 917b679f590..81df08c87e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.http-rp/unset/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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": "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
index ab450e5b6d4..de2e5a9c490 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
@@ -27,23 +27,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
index b720b2845a7..983bdaa3bbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
@@ -17,23 +17,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -47,93 +47,93 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
index c243338edba..7f28364d6f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -17,23 +17,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -57,83 +57,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
index a6219f7b99c..2f40d7d3172 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -18,82 +18,82 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -107,23 +107,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
index 48046be9078..9eb61cc176c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -17,53 +17,53 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,23 +77,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -107,13 +107,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -127,13 +127,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
index 8c16d7dcf91..3963f27bec0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
@@ -17,63 +17,63 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -97,33 +97,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
index 0de9a1a02ca..46700793f0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
index 6d5b7b41b62..3b8544271c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
index dd809cbb790..8800e866a9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html
index cf0696c8251..3673e5e00ee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/origin-when-cross-origin/xhr.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html
index 143b2bcc99a..7f3ee713ec6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/fetch.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html
index ad5f0c92c10..abe57dfd774 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/iframe-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html
index b283ad25eb7..aa42aa5c051 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/script-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html
index c805d122db4..cb27196125f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/sharedworker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html
index 569dcf90334..a53a4c5894f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html
index ef47493f9d7..cc23f56ac8f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/same-origin/worker-module.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
index 2f3f938253c..3afa172d3d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
index f13292a1f47..18758a748d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
index a418434e0c0..c2f30c1143c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html
index 41452ce220e..a2643f12a5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/a-tag.http.html
@@ -17,43 +17,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html
index a775f4563d2..3e506538da5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/fetch.http.html
@@ -17,123 +17,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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 keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html
index 3c606bb9d0c..5c6f19d46ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/iframe-tag.http.html
@@ -17,123 +17,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html
index f1a05a7dd5a..d4bede06b58 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/img-tag.http.html
@@ -18,122 +18,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html
index 177b2a39ddc..94073a5f6ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/script-tag.http.html
@@ -17,93 +17,93 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -117,23 +117,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html
index 26427318dc8..aa24d06f962 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html
index c0da272d349..95926627de7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/worker-module.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html
index 0af057fc04e..bbb43ad68ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unsafe-url/xhr.http.html
@@ -17,13 +17,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -37,33 +37,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,63 +77,63 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
index 5017723dc23..19c55517e84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
index 60124082878..d0cb7206f8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/fetch.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
index c5eaf1b9b52..fbb87846a7a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/iframe-tag.http.html
@@ -17,42 +17,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -67,72 +67,72 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
index a13f6b0beeb..1433505d9aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/img-tag.http.html
@@ -16,33 +16,33 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -57,6 +57,16 @@
           {
             "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",
@@ -97,12 +107,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +126,13 @@
           },
           {
             "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-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
index f34c612129b..0e7bad7b16d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/script-tag.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html
index e0d775cee1d..7365afae6f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html
index 3f57cf8c807..2533e152165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html
index 16665a4146f..8190dfcdd42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
index ee1b205d66f..81df08c87e7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K-1/gen/top.meta/unset/xhr.http.html
@@ -16,23 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin 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."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,33 +36,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,13 +76,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin 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",
@@ -106,33 +96,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
index 305db3d51ff..f766c2d37f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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",
@@ -97,42 +97,42 @@
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
index 7daee4808c4..213d16bf07c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
@@ -17,52 +17,52 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -76,23 +76,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,33 +106,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
index 47ef89c00a9..2b3587e828b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
@@ -16,16 +16,6 @@
         [
           {
             "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."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -36,33 +26,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,33 +76,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 keep-origin 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-http",
-            "redirection": "keep-origin",
+            "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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
index 0d99b76db33..888ef8183d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
@@ -17,102 +17,102 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
index 9be2500bbf0..6b1681106a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
index 487709f01e9..f382044bad9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
index d7d412fb02d..45a6cbc98b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
index cfe20a86dd1..00f7e69b577 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
index 56a6cb4afcc..c498ec68feb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
index 682959ab4e4..79dee133587 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
index a3b4f54713b..ed4c29375ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
index e3e564ea5d6..12c61b4eb5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
index 8db35518f51..4bbf83cbe5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html
index 487709f01e9..f382044bad9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html
index e3e564ea5d6..12c61b4eb5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html
index 8db35518f51..4bbf83cbe5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/same-origin/xhr.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
index 487709f01e9..f382044bad9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
index cfe20a86dd1..00f7e69b577 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index a3b4f54713b..ed4c29375ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html
index ce70318c4ca..55a4ab590eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html
index e4b6a9130f9..f766c2d37f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/fetch.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
+            "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 keep-origin 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",
@@ -96,43 +96,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html
index 75d4c872dd1..213d16bf07c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/iframe-tag.http.html
@@ -16,33 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "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-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,43 +56,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "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 cross-https origin and swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
+          },
+          {
+            "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",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html
index adda1c2a81f..2b3587e828b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/img-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -37,42 +37,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,53 +86,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html
index d94a5308475..888ef8183d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/script-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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",
+            "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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html
index a3b4f54713b..ed4c29375ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html
index 76e9bca4bb1..6b1681106a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unsafe-url/xhr.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -47,12 +47,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,13 +66,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,23 +86,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
index e0f063f1268..55a4ab590eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/a-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
index a269ab29354..f766c2d37f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/fetch.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -36,83 +36,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
index 07b8ec6f639..213d16bf07c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/iframe-tag.http.html
@@ -26,33 +26,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,73 +66,73 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
index 63a79888337..2b3587e828b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/img-tag.http.html
@@ -16,73 +16,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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",
@@ -96,23 +96,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
index 6415ff567e7..888ef8183d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/script-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,23 +46,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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",
@@ -76,13 +86,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,33 +116,23 @@
           },
           {
             "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-http",
-            "redirection": "keep-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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html
index a3b4f54713b..ed4c29375ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html
index e3e564ea5d6..12c61b4eb5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
index 53708453cd4..6b1681106a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.http-rp/unset/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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": "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
index 0832258c2ce..ca36f256e28 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
@@ -27,23 +27,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
index be72e4b4ab0..8d7a411faac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
@@ -17,23 +17,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -47,93 +47,93 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
index a4bb979ae1f..03297e0b52b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -17,23 +17,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -57,83 +57,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
index d1c8f5e0123..f8e9a9c6e93 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -18,82 +18,82 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -107,23 +107,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
index 6639f77d3c9..1aeaea79294 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -17,53 +17,53 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,23 +77,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -107,13 +107,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -127,13 +127,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
index bf27c6d7d5b..760a3040d8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
@@ -17,63 +17,63 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -97,33 +97,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
index a473081e1a4..d7b7b1dbf4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
index 6070c955b0f..3694ed7f942 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
index ca723b743f5..02a4792f0d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html
index a5c9bc636e9..0be8f5d2228 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/origin-when-cross-origin/xhr.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html
index aef048ae396..1f245254af3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/fetch.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html
index 191133231aa..76c8c950450 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/iframe-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html
index 4235e62f1b0..8c27ac57302 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/script-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html
index c405955bd88..604a56b3aa6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/sharedworker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html
index 49b42a9b2e6..083e588f2e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html
index 226bb2905b9..11845c01c20 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/same-origin/worker-module.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
index 281940c1e14..57932b2a5d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
index 54bbd4480bd..aba97cbd2f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
index b93e49112f8..c3b1a964592 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html
index 2b6f5426458..0206ccc83c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/a-tag.http.html
@@ -17,43 +17,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html
index e6c70ea16a3..3f4d829ea57 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/fetch.http.html
@@ -17,123 +17,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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 keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html
index aea5730cd86..6375f350ada 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/iframe-tag.http.html
@@ -17,123 +17,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html
index 3897b720712..09dc074ff70 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/img-tag.http.html
@@ -18,122 +18,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html
index 0e622d5b29f..5b9cff8a4ff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/script-tag.http.html
@@ -17,93 +17,93 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -117,23 +117,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html
index 78b384b2320..9a1084e625b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-classic.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html
index d03178e4e77..d9559312acc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/worker-module.http.html
@@ -18,22 +18,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html
index fdb9ebf3acd..eec1fe65e79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unsafe-url/xhr.http.html
@@ -17,13 +17,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -37,33 +37,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,63 +77,63 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
index bc3590bb6ec..55a4ab590eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
index b8e93ffa8f6..f766c2d37f9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/fetch.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
index 47ed51e98c4..213d16bf07c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/iframe-tag.http.html
@@ -17,42 +17,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -67,72 +67,72 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
index dc5824246a6..2b3587e828b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/img-tag.http.html
@@ -16,33 +16,33 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -57,6 +57,16 @@
           {
             "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",
@@ -97,12 +107,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +126,13 @@
           },
           {
             "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-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
index d5fd16df680..888ef8183d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/script-tag.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html
index 682959ab4e4..79dee133587 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html
index a3b4f54713b..ed4c29375ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html
index e3e564ea5d6..12c61b4eb5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
index 6c145d5a79b..6b1681106a2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/4K/gen/top.meta/unset/xhr.http.html
@@ -16,23 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin 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."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,33 +36,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -86,13 +76,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin 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",
@@ -106,33 +96,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html
index 83deabb9643..3a39abcf1f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,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 stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html
index 280b37f5771..397071f2115 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
index b005077ec42..9f8954b579c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -163,7 +163,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html
index 2fa2e60c8ab..8cdcb555a08 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html
index d69fb429d60..672db55921d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,7 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,7 +201,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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -226,7 +226,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html
index 95e23e87085..750c2a08153 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html
index cb0559d541d..0ab53c440b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,7 +96,7 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -121,8 +121,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -247,8 +247,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html
index e656f126b8f..d523a3109f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html
index d29c3c62226..7761fb304d5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -100,8 +100,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html
index 54cd926399d..f71ded5fb6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,7 +33,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -58,7 +58,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html
index bc615407a4e..5430b987e16 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -100,8 +100,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html
index 5ec048f59d4..2991201b1d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html
index cd68479269f..538136079f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html
index fee790d22f1..ab624c0248e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/no-referrer/xhr.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html
index 3dfaf48d8e8..7b14b1ce47c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html
index a8d571c113e..33993c1ddf0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/fetch.http.html
@@ -15,9 +15,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -205,8 +205,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect 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",
@@ -246,9 +246,9 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html
index 712d1bae34a..7d3edec9faf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html
index 0615a66a3c3..b035834c60a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html
index d1f11b76dad..7aa957c07e6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html
index a4787b55ff5..1088e19bdbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html
index ae01c8c1708..8729a24f09e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html
index f9aaf2c4434..31639bac1bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html
index a8534d09301..434a6b35404 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin-when-cross-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html
index c3cf3a422fd..709a223295c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html
index 66facac8c75..08048d0994d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -205,8 +205,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html
index 6a63d045063..088f80a631b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html
index ba2428290c2..f139e412030 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/img-tag.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html
index 5477d5e0f16..beaff15cf7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-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": "origin",
@@ -100,7 +100,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html
index a0b120e91fa..f6c850fe4fd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html
index 61ad3f8a3dd..513efcf13e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/origin/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
@@ -226,7 +226,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html
index 26f22c20aa8..76ea76b0e79 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html
index 16aa4622f7e..ca748f8bf49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/fetch.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -100,8 +100,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html
index 33ae3a6d9ff..cdd79cbd59b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/iframe-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -185,7 +185,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html
index fd9a9b77d6c..48144e44ee3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -141,9 +141,9 @@
             "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html
index 6c800ae84fc..6d5e38a7504 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -80,7 +80,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html
index 4c290617125..334e848af1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/same-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -141,9 +141,9 @@
             "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html
index 574101790d3..3ce62bd49a4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/a-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -78,8 +78,8 @@
             "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html
index fa7ee7390c7..1e6e9780bb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
@@ -225,9 +225,9 @@
             "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
index 9627686f2bf..6ac87080fa7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -15,9 +15,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
@@ -78,8 +78,8 @@
             "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html
index 52e9ba01c70..d416b44f415 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html
index f1d7c53097f..efc3de1b0aa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index 1821b6c5d37..45bd4d30e33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html
index 22720ba80dd..692e6b8bb2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html
index 7beea7de3d1..73fe9dede9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin-when-cross-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
@@ -100,8 +100,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect 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": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html
index b26e871cc08..e634c212636 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/a-tag.http.html
@@ -37,7 +37,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-http 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html
index 8519c7a9e68..6668438f86a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html
index 2003546a5bd..4998ebf7ead 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html
index e00f2f9ad78..7a71b188a02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html
index 255e7422723..badee807f05 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html
index 624a06084f5..977e4a19eaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html
index f89575f609c..27a27d9ee4a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html
index c8d425ad82f..d3375bae698 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html
index 5e4f133682b..1b0c6bf4b31 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/strict-origin/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html
index 60d501b076e..34a7a49e7cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,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 stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html
index b8dd496d41b..21cd62f1e89 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/fetch.http.html
@@ -37,7 +37,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,7 +138,7 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -226,8 +226,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,7 +243,7 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html
index e184b5fc577..8ba4ffabf0d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,7 +138,7 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -163,7 +163,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html
index 8f365607e44..092fd4fc4d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,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 no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,7 +180,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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -205,7 +205,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html
index cbe698f1a40..4d50b3b90cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -100,8 +100,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "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 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": [
@@ -180,12 +180,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 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,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 keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html
index 6af97817cdf..952dc99dd21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html
index d8488b63438..6712399a63a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html
index 827f90ab2a7..4bc60316998 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html
index fdf1cca6fc4..05f15a98e97 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html
index 4263178d54b..1d289252297 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unsafe-url/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
index a07740d0584..d87289b3931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-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 swap-origin 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": [],
@@ -132,12 +132,12 @@
             "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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
index ec71b7b9dff..5f76c249747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-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": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,7 +132,7 @@
             "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -151,8 +151,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-http origin and no-redirect redirection from http context."
+            "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": "swap-origin",
+            "redirection": "no-redirect",
             "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 swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
index 121e645b8e2..8c95386af49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/img-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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-https origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,7 +162,7 @@
             "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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -181,7 +181,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
index 7dc852f7d63..cdfdb24d358 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,8 +61,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,7 +87,7 @@
             "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,7 +106,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,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 keep-origin 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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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-http origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html
index c4d74a5294e..0c1df2d0219 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
index 5d73f4b7d0e..beb2a4fc38b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.http-rp/unset/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 no-redirect redirection from http context."
+            "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-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,7 +117,7 @@
             "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",
@@ -136,8 +136,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html
index f082ff6a5da..de12bcc3276 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -247,8 +247,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html
index e3401876e0e..b82b165181a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -226,8 +226,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html
index d915b31d2e7..03a3970ab4e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,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 keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html
index 3963bf9cce6..361634ca575 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 stripped-referrer for script-tag to cross-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": [
@@ -159,12 +159,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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html
index e1afc25e7d2..58f7b9b3c21 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html
index 856896a6fdc..3c2d1e15678 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html
index d70fd369ef1..b60df9f303a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html
index 5e4a629ca85..7abc3bd6096 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer-when-downgrade/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html
index 30143c5b218..83efe8b9b0c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html
index 17ccb121c7c..b01056da7d6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -100,7 +100,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html
index 79ad63d9cf6..15a8b4b7dee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -205,8 +205,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html
index 760f1515414..16682a9983b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html
index b80f4d5acad..41d4e9053d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/script-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -142,7 +142,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -205,8 +205,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html
index 807bdfc13b2..00f15c8eed6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html
index 384ffc879ff..6cb42b49b0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html
index 031b1c8de41..660e8a16e7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html
index fbdfe7ab59f..208e7ad99d4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/no-referrer/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html
index 6a1843ba360..dd356554cb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/a-tag.http.html
@@ -36,8 +36,8 @@
             "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,7 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -78,8 +78,8 @@
             "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html
index c8de87a45e4..4b0cb139c30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/fetch.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html
index 0fff6c8a144..3ca1acfeec6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin 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": "origin",
@@ -205,8 +205,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html
index e2d58a94824..c74568d077e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/img-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -80,7 +80,7 @@
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin 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": "origin",
@@ -205,7 +205,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html
index 17155062ae5..ff4c200ec64 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,12 +180,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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html
index 573fa06eada..d04fc6b2022 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html
index 11d09921121..61ff8706362 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html
index f403027fd6f..e16183db00f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html
index edd3cdcc49f..3f1d5cea469 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html
index c9d75ec031f..2e8f1d3f3a8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin-when-cross-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,7 +184,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html
index 99708dc1f9c..99292987da7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,7 +33,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
@@ -58,7 +58,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html
index 4c97df8cd50..8c3ad1c4dc5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html
index 60fd1291449..7a7c98741d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
@@ -247,8 +247,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html
index d6a9a5b8cbd..98f20d3a78e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/img-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html
index 4d67b471320..ab3300de52b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,7 +180,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -205,7 +205,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html
index cb448cd71e4..23af1ff3d5e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html
index 61a4363e94a..b72a27919d8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html
index 20119fc6c1b..e36e58bc24e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html
index edc9aae5235..f2a5f96fb68 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html
index 05cc5e3e39b..90a80b28819 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html
index bb5518d632f..2c8788a3fc1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html
index 3243b7407ee..4a9d042b779 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "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 omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -204,9 +204,9 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html
index f1e973f7491..fe9ed89b2c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -185,7 +185,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html
index 3a24fb18963..33a45c682d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/img-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "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 omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -163,7 +163,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html
index 75c20a0b9e1..a5d467eb5d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -99,8 +99,8 @@
             "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,7 +117,7 @@
             "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 omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "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 omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin 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": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html
index 4132b4f24d6..13b2be2c320 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html
index e9455bc50f2..70808bf035c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html
index 536764e1347..35300e13bf6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html
index e03f3a8c18f..5540c723422 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html
index 0a982601887..d88fe6fe615 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/same-origin/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "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 omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -79,8 +79,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin 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": "omitted",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html
index 344b0f4c8a0..f182ffb3fb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": [
               {
@@ -75,11 +75,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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html
index 9e0e46f3fbb..79460c78c0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -15,9 +15,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -164,7 +164,7 @@
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html
index ab20737aa2c..2e09d681d06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html
index e1149db53a4..b670dc7fe60 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html
index 5c19ed69290..38bc675beb2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/script-tag.http.html
@@ -15,9 +15,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
index 7d403ba7ba5..23a47107eac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
index c0e4b578667..74d3ce8426a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html
index b2fc79339ed..6d3c2a56c04 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html
index fb78eafbf6d..1a79ce37b07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin-when-cross-origin/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect 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": [
@@ -180,12 +180,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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html
index 0d41e9a33be..6326dd15651 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html
index 4d5eb2ef77b..10cddc13cd8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html
index e70240b48d4..1944b34e685 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
@@ -100,8 +100,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html
index 9bee056a6cc..36386aa711c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html
index 2700ce04e2a..55eac6bd2b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -80,7 +80,7 @@
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html
index b932294d3c7..4ffaff067a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html
index 1cbf07354cb..a03df3fece2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/strict-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html
index 458367b475c..64cec3d0cf0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/a-tag.http.html
@@ -37,7 +37,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html
index e848091af45..084ed268e1c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html
index 84c76ac6852..a4d49315e54 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 no-redirect redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,7 +243,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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html
index c390d8cee5e..b318a37f906 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,7 +117,7 @@
             "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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 swap-origin 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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html
index 8072c4f71d3..90ace4d25e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,7 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -101,7 +101,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 cross-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html
index 37a75dddb51..d66916330cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html
index 7a236950362..811b0f2c3f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html
index c57fea3be9d..4e367197fd8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unsafe-url/xhr.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "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 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": [
@@ -180,12 +180,12 @@
             "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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
index 98a6a066b72..e50b1f64a8a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,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 stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-https",
+            "origin": "same-http",
             "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-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html
index 4a405af0ef0..d87289b3931 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 stripped-referrer for fetch to cross-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": [],
@@ -117,11 +117,11 @@
             "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": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,11 +132,11 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
index 13af0c8ba6a..5f76c249747 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,12 +132,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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -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-http origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
index ab43d927432..8c95386af49 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,7 +132,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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -151,8 +151,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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-http origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
index 9ce14f67474..cdfdb24d358 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/script-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-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": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,7 +132,7 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -151,7 +151,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -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-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html
index 6199ad9a330..cdc6ac163cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html
index e72944e9a14..9e5b4b2b17e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html
index c4d74a5294e..0c1df2d0219 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html
index 9c372ad1bf1..65e86f94ecf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html
index 86a70979468..beb2a4fc38b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/iframe.meta/unset/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,8 +61,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,7 +72,7 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -121,8 +121,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,12 +162,12 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html
index d00e69add72..ae91f3ec28e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,7 +44,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -64,7 +64,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html
index 467b6fd3336..8e403aecac9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -28,11 +28,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,12 +44,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -60,11 +60,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,12 +76,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,12 +92,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -108,12 +108,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -124,11 +124,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,11 +140,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -172,12 +172,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -188,11 +188,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html
index 20d96396934..d5bb8f0ef34 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,11 +28,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,12 +44,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -60,11 +60,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,12 +76,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -92,12 +92,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,11 +108,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,11 +124,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,11 +140,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,12 +172,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -188,11 +188,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html
index 5f4b5b5fa40..c70743a04e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag.http.html
@@ -33,7 +33,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,12 +44,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -60,12 +60,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,11 +76,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,7 +108,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -128,8 +128,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,11 +140,11 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -172,7 +172,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -192,8 +192,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -204,7 +204,7 @@
                 "value": "no-referrer-when-downgrade"
               }
             ],
-            "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html
index 3b876773fb2..ab7cd57f3d0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html
index 709707c6e7a..e9dfa7da6d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -28,12 +28,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -44,11 +44,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,12 +60,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -76,12 +76,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,12 +92,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -108,11 +108,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,11 +124,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,12 +140,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -156,12 +156,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -172,11 +172,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,12 +188,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -204,7 +204,7 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html
index c28cdcef87b..61fecbcb0b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/img-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,12 +28,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -44,12 +44,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -60,11 +60,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,11 +76,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,12 +108,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -124,11 +124,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,7 +140,7 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -160,8 +160,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,12 +172,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -188,11 +188,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html
index c7c6bf629e9..1e23802ced0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/no-referrer/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -28,12 +28,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,12 +44,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -60,11 +60,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,11 +76,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,12 +108,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -124,12 +124,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,12 +140,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -156,12 +156,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -172,12 +172,12 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -188,7 +188,7 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html
index 60ab249521c..3a027ff7d6c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,7 +44,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -63,8 +63,8 @@
             "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html
index 0c0976c4e9c..9ea1f00476b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -28,11 +28,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,12 +44,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -60,12 +60,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -76,12 +76,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,12 +92,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -108,12 +108,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -124,12 +124,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -140,11 +140,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,7 +156,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -175,8 +175,8 @@
             "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,11 +188,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html
index 2e477d88157..b43f8ee0b74 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,11 +28,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,11 +76,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,11 +108,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,11 +124,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,11 +140,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,11 +172,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,12 +188,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -204,7 +204,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html
index 37f30ca9289..ec677b6a553 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -28,12 +28,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,12 +44,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -60,12 +60,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,12 +76,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -92,11 +92,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -108,12 +108,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -124,12 +124,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,7 +140,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
@@ -160,7 +160,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -172,11 +172,11 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,12 +188,12 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -204,7 +204,7 @@
                 "value": "origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag.http.html
index beef14fa66c..64483ee7bda 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html
index ff1829b9876..c573d1841da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -28,12 +28,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -44,11 +44,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,12 +76,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,12 +92,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -108,11 +108,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,11 +124,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,11 +140,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -172,11 +172,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,12 +188,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -204,7 +204,7 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag.http.html
index 2e50298cb68..eff9cafda0a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,7 +28,7 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-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": "origin",
@@ -48,7 +48,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
@@ -96,8 +96,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,12 +108,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -124,12 +124,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -140,12 +140,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -156,12 +156,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,12 +172,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -188,11 +188,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag.http.html
index 41967e94cf2..e5743a567e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -28,11 +28,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,12 +60,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,12 +76,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -92,12 +92,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,11 +108,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,12 +124,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,11 +140,11 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -172,12 +172,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -188,12 +188,12 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -204,7 +204,7 @@
                 "value": "origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html
index cd7ffc348c0..e3f37212efb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "same-origin"
               }
             ],
-            "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 omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,7 +60,7 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html
index 31fbe765a1a..0ae0c077756 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html
@@ -33,7 +33,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -44,11 +44,11 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,12 +60,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -76,12 +76,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,11 +92,11 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -108,12 +108,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -124,12 +124,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -140,12 +140,12 @@
                 "value": "same-origin"
               }
             ],
-            "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 omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -156,12 +156,12 @@
                 "value": "same-origin"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -172,7 +172,7 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html
index 0b60d1df47d..f2b40fb5428 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,12 +28,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -44,12 +44,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -60,7 +60,7 @@
                 "value": "same-origin"
               }
             ],
-            "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 omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -79,8 +79,8 @@
             "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "same-origin"
               }
             ],
-            "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 omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,12 +108,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -124,11 +124,11 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,12 +140,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -156,12 +156,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin 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": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,7 +172,7 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted 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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html
index f5324baddfd..fa17836a614 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/same-origin/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,12 +28,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,11 +44,11 @@
                 "value": "same-origin"
               }
             ],
-            "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 omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,12 +60,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,12 +76,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -92,12 +92,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,12 +108,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -124,11 +124,11 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,12 +140,12 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -156,12 +156,12 @@
                 "value": "same-origin"
               }
             ],
-            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -172,7 +172,7 @@
                 "value": "same-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html
index 268108ea955..ffd3f95fe2d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html
index 6fd331a42f1..111205e1579 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -28,12 +28,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -44,12 +44,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -60,12 +60,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -76,11 +76,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,7 +92,7 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
@@ -111,9 +111,9 @@
             "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": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -124,12 +124,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -140,11 +140,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,11 +156,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -172,11 +172,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,12 +188,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -204,7 +204,7 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html
index 8874ca657bf..3d45b4e7a1a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,12 +28,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -44,11 +44,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,12 +76,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -92,12 +92,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,11 +108,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,11 +124,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,11 +140,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,11 +172,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -188,7 +188,7 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html
index 20c192e560d..44c9a7d8972 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,12 +28,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,12 +44,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -60,12 +60,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,12 +76,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -92,12 +92,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,11 +108,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,12 +124,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,11 +140,11 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -172,12 +172,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -188,12 +188,12 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -204,7 +204,7 @@
                 "value": "strict-origin-when-cross-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html
index c9e3865b453..c1f732a3e53 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html
index 1bff8c146a9..91d9eea523d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,12 +28,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -44,12 +44,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -60,11 +60,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,12 +76,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,11 +92,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -108,12 +108,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -124,7 +124,7 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -144,7 +144,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -172,12 +172,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -188,12 +188,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -204,7 +204,7 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html
index c2b990d1177..800fb23943b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,12 +28,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -44,11 +44,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,11 +76,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,12 +108,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-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": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -124,11 +124,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -140,12 +140,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -156,12 +156,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,12 +172,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -188,11 +188,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html
index 8da013a20d5..4337612c3b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/strict-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -28,12 +28,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,12 +44,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -60,12 +60,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,11 +76,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,11 +108,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,12 +124,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,11 +140,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -172,12 +172,12 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -188,11 +188,11 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -204,7 +204,7 @@
                 "value": "strict-origin"
               }
             ],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html
index c578b90e357..04e590c37e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,7 +28,7 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -64,7 +64,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html
index 37daa670d1e..4c2a09f18a5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,12 +28,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -44,11 +44,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,12 +60,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -76,12 +76,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -92,12 +92,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -108,12 +108,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -124,12 +124,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -140,12 +140,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -156,11 +156,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -172,12 +172,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -188,12 +188,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
@@ -204,7 +204,7 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html
index 65c363e7d6b..b1053ab0e26 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -28,12 +28,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -44,12 +44,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -60,12 +60,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -76,11 +76,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -92,12 +92,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -108,11 +108,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,12 +124,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -140,11 +140,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -156,12 +156,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -172,12 +172,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -188,12 +188,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
@@ -204,7 +204,7 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html
index 21f58903f21..51b0db7d1af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.attr/unsafe-url/script-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -28,12 +28,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -44,12 +44,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -60,12 +60,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -76,12 +76,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -92,12 +92,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -108,11 +108,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -124,12 +124,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -140,12 +140,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -156,11 +156,11 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
@@ -172,12 +172,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -188,12 +188,12 @@
                 "value": "unsafe-url"
               }
             ],
-            "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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
@@ -204,7 +204,7 @@
                 "value": "unsafe-url"
               }
             ],
-            "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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html
index 39a73f3f21a..0205df0cdef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/req.rel-noref/no-referrer/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -28,11 +28,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -44,11 +44,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -60,11 +60,11 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -76,7 +76,7 @@
                 "value": "no-referrer"
               }
             ],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html
index 1189ee736e6..c00ba92de5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html
index 7a496dcc90c..ed3bc61f018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-http 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": [],
@@ -131,7 +131,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."
           },
           {
             "expectation": "stripped-referrer",
@@ -151,7 +151,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,11 +161,11 @@
             "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,11 +176,11 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
index 44be5e09207..a4fb7d8629b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -120,7 +120,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,11 +131,11 @@
             "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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,7 +146,7 @@
             "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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -165,7 +165,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,11 +176,11 @@
             "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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html
index 39ea7aca89e..948089af7e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,7 +26,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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-http origin and swap-origin 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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -180,8 +180,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html
index 7688f601154..5d152c996af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/script-tag.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 no-redirect redirection from http context."
+            "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-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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-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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -150,8 +150,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,11 +161,11 @@
             "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html
index a843e75fd25..de1c533bfc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html
index 27e4d4495a3..c088ac04d7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/sharedworker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html
index 708909e4856..8433c4d9df9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/worker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html
index 54d5403ce0c..20d3eb1ff82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -120,7 +120,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,7 +131,7 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -151,7 +151,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,11 +161,11 @@
             "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,12 +176,12 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html
index 2ab75e2b4ef..f9fada238b8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "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 omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html
index a885d7315ca..8bc2cf3b064 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/fetch.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "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 omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html
index aecda128ebe..555121b5330 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/iframe-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -180,7 +180,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html
index bc6270820d5..8fe04405cec 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,11 +146,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html
index 6ea115a3d6e..08bc8089647 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/script-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,7 +116,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -135,8 +135,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,11 +146,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -161,11 +161,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,11 +176,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html
index a91c5aad664..05f26609235 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/worker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html
index fdbe13ed48a..529b7646c85 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/xhr.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,7 +26,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -45,8 +45,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -90,7 +90,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -121,7 +121,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html
index d7d69dd0148..6ed5f3bb75a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
-            "origin": "cross-http",
+            "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 origin 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-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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "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 origin for a-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html
index db9eaac047f..6ce6800ed1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/fetch.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,11 +116,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin 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": "keep-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 keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for fetch to cross-https origin and swap-origin 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html
index 06fbcb50a47..6a0c5286868 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/iframe-tag.http.html
@@ -14,9 +14,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "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 origin for iframe-tag to same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "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 origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 origin for iframe-tag to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 origin for iframe-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "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 origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for iframe-tag to cross-https origin and swap-origin 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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html
index 71066142d40..aed278716d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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,11 +116,11 @@
             "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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -146,11 +146,11 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "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 origin for img-tag to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "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 origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html
index 7545ef13019..74212a61fb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/script-tag.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "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 origin for script-tag to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 origin for script-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-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 origin for script-tag to cross-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "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 origin for script-tag to cross-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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,7 +176,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
index a843e75fd25..de1c533bfc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html
index 619a3b30394..bc0657d31ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html
index e0e971b380c..a54c8dec65e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/xhr.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -146,11 +146,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for xhr to cross-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for xhr to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html
index d9578a64cb8..5f24860f175 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
-            "origin": "same-http",
+            "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 origin for a-tag to same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html
index 0bdf7d22e97..75e1bac1790 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/fetch.http.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html
index ddfcbe6e9e0..8e40188f6c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/iframe-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
@@ -120,8 +120,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,11 +146,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html
index d389be34347..21013c61e48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html
index 83c69272448..3e542dbb59a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/script-tag.http.html
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html
index 5749ed2e610..5bd76319664 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/sharedworker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html
index 69ad2476abf..3a901d4df9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/worker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html
index 5303f20172a..0e691f80797 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/xhr.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -75,7 +75,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,7 +86,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
@@ -105,7 +105,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,11 +116,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,7 +176,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-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": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html
index 48e93db1fd1..4722bc8f922 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/a-tag.http.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "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 omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -44,8 +44,8 @@
             "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html
index ba590382717..ca88a138c07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/fetch.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,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 omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "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 omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,7 +116,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -134,9 +134,9 @@
             "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin 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": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html
index fd13662ae18..a95cfde13a6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/iframe-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,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 omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -116,7 +116,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -134,9 +134,9 @@
             "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html
index ccb74bb52fa..81c06823b6a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "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 omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -104,9 +104,9 @@
             "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "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 omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html
index d62279f4807..450ebffcc02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/script-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,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 omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,11 +116,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html
index 3ca4596a021..9069ca99241 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/xhr.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "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 omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -120,7 +120,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html
index e269614fd51..6ed5f3bb75a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/a-tag.http.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "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 origin for a-tag to same-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": "origin",
-            "origin": "cross-https",
+            "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 origin for a-tag to cross-https 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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "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 origin for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html
index bd8ce6b7c9d..6ce6800ed1b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,7 +86,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
@@ -105,8 +105,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-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 origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,11 +161,11 @@
             "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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -176,11 +176,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
index 372997630c4..6a0c5286868 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin 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": "origin",
@@ -105,8 +105,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "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 origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-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 origin for iframe-tag to cross-http origin and swap-origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-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 origin 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "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-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http 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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html
index 39b1299d892..aed278716d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,11 +116,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -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 keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-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 origin for img-tag to cross-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,11 +161,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "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 origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html
index b8a3ecb1023..74212a61fb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/script-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -120,8 +120,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,7 +131,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin 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": "origin",
@@ -150,7 +150,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "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 origin for script-tag to cross-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for script-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index 708909e4856..8433c4d9df9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html
index 619a3b30394..bc0657d31ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/worker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html
index 70af057f3ae..a54c8dec65e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/xhr.http.html
@@ -14,8 +14,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -101,11 +101,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -146,11 +146,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "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 origin for xhr to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for xhr to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html
index ba1c6cbabd0..5f24860f175 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html
index fdb84527ad7..75e1bac1790 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/fetch.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
@@ -45,8 +45,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,7 +176,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html
index 4b44fec638b..8e40188f6c9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/iframe-tag.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
@@ -120,8 +120,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,12 +161,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html
index 5cfd0e29868..21013c61e48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag.http.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
@@ -91,7 +91,7 @@
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,7 +146,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
@@ -165,8 +165,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,12 +176,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html
index 9011a2adfe1..3e542dbb59a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/script-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
@@ -90,7 +90,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -101,11 +101,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,7 +161,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
@@ -180,7 +180,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html
index 5749ed2e610..5bd76319664 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/sharedworker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html
index 47170d8b719..0e691f80797 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/xhr.http.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,12 +116,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +131,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,12 +146,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -161,11 +161,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,7 +176,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html
index cc4e601f029..c00ba92de5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
+            "origin": "same-http",
             "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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html
index 63761b377ed..ed3bc61f018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/fetch.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 no-redirect redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,11 +116,11 @@
             "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 keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,7 +131,7 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -165,8 +165,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html
index bc9d347f02f..a4fb7d8629b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/iframe-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-http origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html
index 9e1351ad27a..948089af7e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,12 +86,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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -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-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html
index 8d45840c007..5d152c996af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/script-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,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 keep-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,12 +146,12 @@
             "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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-http origin and swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html
index a843e75fd25..de1c533bfc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html
index 27e4d4495a3..c088ac04d7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/sharedworker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html
index 708909e4856..8433c4d9df9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html
index 619a3b30394..bc0657d31ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/worker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html
index c2ea9b622e9..20d3eb1ff82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/xhr.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -90,8 +90,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
index c40ba811b6e..c00ba92de5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,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 stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-https",
+            "origin": "same-http",
             "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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
index dfb07032dc5..ed3bc61f018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/fetch.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -56,12 +56,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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,12 +86,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,11 +116,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,7 +131,7 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -150,8 +150,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
index 6d43a194f89..a4fb7d8629b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/iframe-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-http 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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,7 +146,7 @@
             "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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -165,8 +165,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
index 661acb82348..948089af7e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,12 +101,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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-https origin and swap-origin 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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,11 +146,11 @@
             "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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -161,11 +161,11 @@
             "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 stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,12 +176,12 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
index 07fd5ec6dc5..5d152c996af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/script-tag.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,7 +116,7 @@
             "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -135,8 +135,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,11 +146,11 @@
             "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -161,12 +161,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 keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
index a353de2b600..20d3eb1ff82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/xhr.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html
index 475ca44bcba..b0843010b78 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -62,7 +62,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,12 @@
             "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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 no-redirect redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "redirection": "keep-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 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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,12 +162,12 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html
index 9754cae0ccb..70b6f860331 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,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 stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,11 +87,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and swap-origin redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "redirection": "keep-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 swap-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html
index 2573ce2a51a..5d74b8662e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,7 +72,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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and swap-origin redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "redirection": "keep-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 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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,12 +162,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 keep-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "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 keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html
index c24f793981f..9ad1c791693 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,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 no-redirect redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -77,7 +77,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-http 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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,11 +177,11 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -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-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html
index 20cd6ae2977..b97f3311f81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html
index 36208a2f230..0cd0c64765e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html
index 7367fe7a683..70aee4ec28b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,8 +61,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -121,8 +121,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-http origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html
index c296e794fbe..36beb5760f3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/a-tag.http.html
@@ -31,7 +31,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "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 omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html
index 26cb3e96f22..ed6e1c7e0cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html
index b150737473a..edd06e5c027 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html
index 70c5a3af53e..9395c930732 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html
index 64cd47f58d4..0d253b26ea7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html
index e3185a29fd9..fb3fba8ef66 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html
index cea1c7da6cb..b8a8134149f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html
index 688fdaeb065..44879f5d1fc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html
index 5e016c79f7c..01422220324 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,11 +87,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "cross-http",
+            "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 origin for fetch to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 origin for fetch to cross-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,7 +147,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
@@ -165,9 +165,9 @@
             "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,7 +177,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html
index 5ba473ec569..cc80c5b686c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "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 origin for iframe-tag to same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-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 origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "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 origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "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 origin for iframe-tag to cross-http 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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html
index c9f97bacd74..5aae8d81060 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "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 origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-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 origin for img-tag to cross-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -177,11 +177,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html
index ad159a6832f..0cbe39c632c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 origin for script-tag to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-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 origin for script-tag to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "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 origin for script-tag to cross-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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "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 origin for script-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for script-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html
index 4a684a48ec2..6e5f40d5424 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html
index ba4c7680eb7..55eb25bc24f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html
index 93007affaf4..d5ecdddf67e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/xhr.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html
index f16d23fb30b..53d4decc35b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html
index 7e6e3452d69..2bb4704f451 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "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 origin for fetch to same-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,7 +147,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
@@ -166,8 +166,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html
index caa9d1bb2ed..97d69ffe1c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/iframe-tag.http.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,7 +177,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html
index 424789d69e4..ba49c9c8ddf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,11 +87,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http 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": "origin",
-            "origin": "same-https",
+            "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 origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html
index 8ad958190da..d1eb996cc65 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
@@ -106,7 +106,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,7 +132,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -151,8 +151,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html
index 328d2677cd7..1cbe83cc0a0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html
index a173a431758..d90cdc4fbe7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html
index 3be4fae8983..eb55830303d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html
index 7129504b24a..3e743c30e33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,7 +147,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
@@ -166,8 +166,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html
index 4148e128460..121fb003b4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/a-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "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 omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -45,8 +45,8 @@
             "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html
index 085e8f1bb9b..9ae62490b42 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted 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 keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,7 +162,7 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html
index c90e8c5f8a0..d197af252e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,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 omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin 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": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,7 +162,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html
index d6070f0125b..5745f609da2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,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 omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "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 omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-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 omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,7 +162,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html
index 6d6b0d2aaf2..b60fb20b58c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,7 +27,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -45,9 +45,9 @@
             "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "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 omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -132,7 +132,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -150,9 +150,9 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,7 +162,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html
index 5c0e6ad0b86..001be4af970 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html
index a110488a0c5..58c04ab1905 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html
index 3f39011b437..924d350cb5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,7 +27,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,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 omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,7 +147,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html
index 4290b15176b..35d7ea426b0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 origin for fetch to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-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 origin for fetch to cross-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin 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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html
index cbaf2624be1..a7ee5d9e24d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,7 +27,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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": "origin",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "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 origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http 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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for iframe-tag to cross-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html
index 86c570926e3..c7697373613 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-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 origin for img-tag to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "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 origin for img-tag to cross-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "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 origin for img-tag to cross-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "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 origin for img-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html
index e3a6e72d524..76174d3c217 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
@@ -136,7 +136,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -147,7 +147,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect 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": "origin",
@@ -180,8 +180,8 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
index 477e644b255..8288d864544 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html
index e410958029a..62330f80d02 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html
index 37a0e23e22c..6d3f1993657 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html
index 4f61cba096b..a6829c2b3da 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-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 origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,7 +177,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html
index 08e8f3f6c22..2c14a70c274 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
-            "origin": "same-http",
+            "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 origin for a-tag to same-http 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html
index 3a0c75bc15e..342365da7fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-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": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -136,8 +136,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html
index 083012ea763..be4d7494f5d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,12 +162,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html
index d3dc635d593..94e98355521 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag.http.html
@@ -46,8 +46,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,11 +132,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html
index ec72a0eed26..4b67d45c7b1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/script-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,11 +87,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,7 +132,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -151,7 +151,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html
index 05802e3cfdf..793fe211db1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -132,12 +132,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,11 +162,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -192,7 +192,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html
index dff62c2e7d7..3815612c67b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/a-tag.http.html
@@ -31,7 +31,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-https",
+            "origin": "same-http",
             "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-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html
index c066d0b0e25..aee1cef03d2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-http origin and no-redirect redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html
index 1668c77e526..f978f534855 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 swap-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,12 @@
             "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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html
index c6a8aa79063..df369004aca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag.http.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,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 keep-origin 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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -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-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,11 +177,11 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -192,7 +192,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html
index 4f19861458b..62b04cd422a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,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 keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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-http origin and no-redirect redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-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-https origin and swap-origin 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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and swap-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html
index a54ace700bb..9a10d868f1e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html
index 0864611a324..8625bc2be3d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html
index e89ff67aa34..b5e6906ca41 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,7 +27,7 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,12 +72,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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,11 +102,11 @@
             "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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "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 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": [],
@@ -132,12 +132,12 @@
             "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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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 cross-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,11 +162,11 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -177,12 +177,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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
index c40ba811b6e..c00ba92de5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/a-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,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 stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-https",
+            "origin": "same-http",
             "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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
index 3c21a644218..ed3bc61f018 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/fetch.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,11 +131,11 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -146,12 +146,12 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "no-redirect",
             "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
index ca487492db8..a4fb7d8629b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/iframe-tag.http.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -26,12 +26,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,11 +71,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-http 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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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-https origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-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 cross-https origin and no-redirect redirection from http context."
+            "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": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -176,11 +176,11 @@
             "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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -191,7 +191,7 @@
             "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
index f774c78c509..948089af7e8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -71,12 +71,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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -105,7 +105,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,11 +116,11 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,12 +131,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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,7 +146,7 @@
             "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -165,7 +165,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -176,11 +176,11 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -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-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
index 76b530a3c76..5d152c996af 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/script-tag.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,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 swap-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "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 stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,11 +101,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,7 +116,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 keep-origin 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",
@@ -136,7 +136,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "keep-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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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-http origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html
index a843e75fd25..de1c533bfc8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html
index 27e4d4495a3..c088ac04d7f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/sharedworker-module.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html
index 708909e4856..8433c4d9df9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/worker-classic.http.html
@@ -16,7 +16,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
index b0dc12ef044..20d3eb1ff82 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc-inherit.meta/unset/xhr.http.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,12 +41,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -101,11 +101,11 @@
             "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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -116,11 +116,11 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,12 +131,12 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html
index 68724c1708d..ad1b95be6ea 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/a-tag.http.html
@@ -37,7 +37,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,7 +54,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html
index 02691e775d9..d7a7c2d3794 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,7 +201,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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -247,8 +247,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html
index 8669b55a899..1a3dd3dd4b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -184,7 +184,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,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 swap-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html
index 244e578558a..7870f4c9132 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,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 keep-origin redirection from http context."
+            "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": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html
index 97cc4e7a635..fc27a57138b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "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 stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "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 stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,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 keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html
index 34af03ca673..74ad68f0008 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html
index d1160fb688f..46436365374 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 no-redirect redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,7 +243,7 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html
index 11f9f237259..36341adda39 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html
index 1c629b9b91e..25451f4dde4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html
index 90aabf12765..c61d37eaf47 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html
index f3212de9326..11da083b28a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html
index bff2188c657..2212cb9a0cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html
index 4b636f7b5fb..b09570e831a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html
index 758c5450aed..140ea2da6fb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html
index e46c3a64730..1bbb9c5c75f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/no-referrer/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html
index af24ac11e51..ee2e6c78439 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html
index aa73eba7aa9..12ddcd65ffa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,12 +201,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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html
index bff82896d00..8acad56a6cf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": [
@@ -180,7 +180,7 @@
             "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": "origin",
@@ -205,8 +205,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html
index ce3147bd42c..32c40aea692 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,7 +117,7 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -142,7 +142,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html
index afa02cb7d8e..6e56b646b0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html
index d181521dae7..cc0fdce675d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html
index 07694c5abe4..5776162e7a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/xhr.http.html
@@ -15,9 +15,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,7 +184,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html
index c4db1513f60..6dc1dacc698 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,7 +33,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
@@ -58,7 +58,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html
index 4d2a7e3a883..bd7784c9015 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -100,7 +100,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-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": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html
index fc6dd5cd35c..d8824fa9f03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/iframe-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,7 +33,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
@@ -58,8 +58,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html
index 551847872d9..49e4bc5070b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html
index 72fbdfed834..a8e94aa0177 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/script-tag.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https 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": "origin",
@@ -247,7 +247,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html
index 4fef6039978..b7926c24975 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html
index 888d5daad92..36a8df402cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html
index 8d927e8173a..5aaaca5685a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
@@ -226,8 +226,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html
index d0b8e664f86..aadbf7fb983 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/a-tag.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,7 +33,7 @@
             "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 omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -57,8 +57,8 @@
             "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html
index f190cf566d5..df0fd291aaf 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html
index 6d412035e47..8f39518c148 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/iframe-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -183,8 +183,8 @@
             "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin 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": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html
index 9b3f3fe2883..76937a1aa7c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html
index 5c2e5a3f447..2b286d7fe99 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/script-tag.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -79,8 +79,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -183,9 +183,9 @@
             "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin 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": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html
index ec884c12ddc..9cf860273c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html
index 0e71a00c9a6..1eeb215c53e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html
index 7219ad2a54f..72e667fa3f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/same-origin/xhr.http.html
@@ -15,9 +15,9 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,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 omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -183,8 +183,8 @@
             "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin 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": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html
index 82922cd3b54..cf0711b74be 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/a-tag.http.html
@@ -36,8 +36,8 @@
             "test_description": "Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html
index d137e56be00..33e4c1a6f7d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "keep-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html
index 83b016d810a..056c2849aee 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -120,9 +120,9 @@
             "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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",
@@ -246,9 +246,9 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html
index e6989b7b625..9576422d11c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and swap-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",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html
index bbf0023296e..b680ebe771d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": [
@@ -180,11 +180,11 @@
             "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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
index c97a419c5d3..6af874ec0f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
index b1251a00ab8..172f2c15a86 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html
index b020d307b15..1e32011c918 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html
index 271ca91add2..259bfeb4b06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/xhr.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,7 +33,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
@@ -58,8 +58,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": [
@@ -180,12 +180,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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html
index e84c3016a25..753da36466c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html
index 1f94e6e5731..f96d1f936c6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html
index 023119615d5..11bc06518f0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/iframe-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
@@ -247,7 +247,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html
index 15e26233a45..19ba6cebb84 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
@@ -226,8 +226,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html
index ef33ade33c7..5a2729437ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/script-tag.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html
index 6142c7cf8b2..567c52ba798 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html
index fa4b347b783..16428d85b9c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html
index e4e8691939c..73e2d63e717 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html
index 13ff5fc9755..64a7218f919 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/strict-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
@@ -247,7 +247,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html
index 9bc9f831bf0..ca36059a24a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/a-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,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 stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -75,11 +75,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 stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html
index 0cf6ad6f393..401163abef6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 cross-https origin and swap-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,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 no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html
index e26510ce25e..403a67545ac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/iframe-tag.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "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 stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -79,8 +79,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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-https origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,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 keep-origin 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-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html
index 7397fc93a55..f06a89ddea6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "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 stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,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 stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "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 stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,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 stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html
index c0528e3d3ed..fba1aa8bcc3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/script-tag.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -100,7 +100,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,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 swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 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": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "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 stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html
index 89b5698e6fe..c535aa1e165 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/sharedworker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html
index 219639f3a6d..199ced3e5e3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/srcdoc.meta/unsafe-url/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
index 7c953a9fa72..5c2ed3836d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -15,73 +15,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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",
@@ -96,42 +96,42 @@
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
index 705566d807d..26d595fcc6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,52 +16,52 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -75,23 +75,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -105,33 +105,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
index 7b785694b1c..0827ebde9c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag.http.html
@@ -15,16 +15,6 @@
         [
           {
             "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."
-          },
-          {
-            "expectation": "stripped-referrer",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -35,33 +25,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -85,33 +75,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 keep-origin 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-http",
-            "redirection": "keep-origin",
+            "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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
@@ -125,13 +125,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
index 65a8ccf6fac..c5cad6a0433 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag.http.html
@@ -16,102 +16,102 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -125,13 +125,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
index a6a57b7c443..b3380b89ba3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "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 cross-http 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-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html
index 9e815f629f5..29adaac66b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag.http.html
@@ -15,43 +15,43 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html
index 3320e7dedd6..d6ac45a7284 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/fetch.http.html
@@ -15,53 +15,53 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -76,62 +76,62 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html
index c5a6c910383..d39830b5794 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html
index 8fa0dbc5b82..566c3252ecd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag.http.html
@@ -15,93 +15,93 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -115,23 +115,23 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html
index 5bed4c11f28..63e54ba482a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag.http.html
@@ -16,6 +16,16 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -25,43 +35,43 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -85,13 +95,13 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -105,33 +115,23 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html
index 2b149b9ed87..25bbdd1a08d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html
index 858ae2c8bc8..5845fa807de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html
index 869faa6d758..7297e57a645 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html
index 77a15e2dd09..f80b28b5cbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/no-referrer/xhr.http.html
@@ -25,113 +25,113 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html
index d90774e096e..72e159c72e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
@@ -35,13 +35,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
index b019659e918..1dfb592eebb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch.http.html
@@ -25,53 +25,53 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
@@ -85,33 +85,33 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect 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",
@@ -124,14 +124,14 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
index e3a8907ac19..557d6a53235 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag.http.html
@@ -16,42 +16,32 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "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 origin for iframe-tag to same-https origin and keep-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect 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": "origin",
@@ -85,13 +75,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "iframe-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context."
+          },
+          {
+            "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 origin for iframe-tag to cross-http origin and keep-origin 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": "origin",
@@ -105,13 +105,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -124,14 +124,14 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
index e400d731c27..3987df15184 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag.http.html
@@ -16,32 +16,32 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
@@ -54,64 +54,64 @@
             "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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",
@@ -124,14 +124,14 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
index 308240540a0..788c8d04f2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag.http.html
@@ -15,83 +15,83 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-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",
+            "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 keep-origin 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": "origin",
@@ -105,33 +105,33 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
index befe32ab221..1bc6f04b8cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html
index c353e26d81d..a24ee872ad7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
index fded5a2a20c..7e6e8f3c5f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
index 2fcb84fa544..ae453ee0f00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
index 54122e01598..866577c3366 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr.http.html
@@ -15,103 +15,103 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "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 origin 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",
@@ -124,14 +124,14 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html
index 37597a81f50..496521351a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/a-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
@@ -45,13 +45,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html
index ca2af79a209..b4d01617390 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/fetch.http.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-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": "origin",
@@ -55,13 +55,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -75,63 +75,63 @@
           },
           {
             "expectation": "origin",
-            "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 origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "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 origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html
index 795622918aa..e2eb629831f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/iframe-tag.http.html
@@ -16,12 +16,12 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -35,83 +35,83 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "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 origin for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "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 origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin 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": "origin",
@@ -125,13 +125,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html
index dfc9e5b47c5..f0c99d563a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/img-tag.http.html
@@ -15,43 +15,43 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -65,23 +65,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -95,43 +95,43 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html
index c062f33481f..f41884b6847 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/script-tag.http.html
@@ -25,113 +25,113 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html
index 524de9eb0af..4e9a4c49112 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html
index 69852cc2cb9..57ce11f6f94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/worker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html
index cbb1aa51723..e1d6b7a798f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/origin/xhr.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html
index 579f3c2857c..563e63e4a03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/a-tag.http.html
@@ -14,14 +14,14 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -34,14 +34,14 @@
             "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html
index a392f281028..bc673974f3e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/fetch.http.html
@@ -15,103 +15,103 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html
index 9ed41f3905c..50e3b2e755b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -34,84 +34,84 @@
             "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin 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": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html
index 22c025b4035..2f106e6e893 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/img-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -35,23 +35,23 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -65,53 +65,53 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin 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": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html
index 592374a71ad..edb8136c045 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/script-tag.http.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -44,24 +44,24 @@
             "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -74,44 +74,44 @@
             "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin 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": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html
index c353e26d81d..a24ee872ad7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html
index 2fcb84fa544..ae453ee0f00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/worker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html
index 9c4aebb45f3..b28d7e378bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/same-origin/xhr.http.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -44,44 +44,44 @@
             "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "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 omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -94,24 +94,24 @@
             "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html
index 1eb1327b9cd..72e159c72e5 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag.http.html
@@ -14,14 +14,14 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-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": "origin",
@@ -44,14 +44,14 @@
             "test_description": "Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
index f1f2cda305e..1dfb592eebb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
index 6019e16a075..557d6a53235 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
@@ -64,74 +64,74 @@
             "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 same-http origin and keep-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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
index 9a8767bbbf8..3987df15184 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag.http.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-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": "origin",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 same-http origin and keep-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": "origin",
@@ -85,53 +85,53 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html
index 62538978b80..788c8d04f2b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag.http.html
@@ -16,92 +16,92 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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": "origin",
@@ -114,24 +114,24 @@
             "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index fded5a2a20c..7e6e8f3c5f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html
index e64ab4f6868..866577c3366 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http 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",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
+            "redirection": "swap-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html
index 6b796b11e14..496521351a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag.http.html
@@ -15,43 +15,43 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "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 origin for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html
index 2287eb080c7..b4d01617390 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/fetch.http.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -45,93 +45,93 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html
index b03d33776cf..e2eb629831f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-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 origin for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html
index 2d645870d72..f0c99d563a3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -35,103 +35,103 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "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 origin for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html
index 4baf28e65a6..f41884b6847 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag.http.html
@@ -15,23 +15,13 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect 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": "origin",
@@ -45,33 +35,33 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -105,33 +95,43 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html
index 524de9eb0af..4e9a4c49112 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html
index 69852cc2cb9..57ce11f6f94 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html
index 92c619c756d..e1d6b7a798f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/strict-origin/xhr.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "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 origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-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 origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html
index 4882d9562dd..67702eb9257 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag.http.html
@@ -15,43 +15,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html
index 11004418408..5c2ed3836d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch.http.html
@@ -15,73 +15,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
+            "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 keep-origin 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",
@@ -95,43 +95,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html
index 66a4e14bfcb..26d595fcc6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag.http.html
@@ -15,33 +15,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "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-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -65,43 +55,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-origin",
+            "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 cross-https origin and swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
+          },
+          {
+            "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",
@@ -115,23 +115,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html
index 2f3824895fe..0827ebde9c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -36,42 +36,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -85,53 +85,53 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html
index b6adfab5181..c5cad6a0433 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "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 cross-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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",
+            "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 no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html
index c353e26d81d..a24ee872ad7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html
index fded5a2a20c..7e6e8f3c5f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html
index f631a7bdafd..b3380b89ba3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,12 +46,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -65,13 +65,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -85,23 +85,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -115,23 +115,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
index 17d3584684b..67702eb9257 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/a-tag.http.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html
index 67c7c94c937..5c2ed3836d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/fetch.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -35,83 +35,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
index dde5a90c1d5..26d595fcc6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/iframe-tag.http.html
@@ -25,33 +25,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -65,73 +65,73 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
index 99c300b8c81..0827ebde9c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/img-tag.http.html
@@ -15,73 +15,73 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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",
-            "redirection": "swap-origin",
+            "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 swap-origin 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",
@@ -95,23 +95,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -125,13 +125,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
index 4f24b475f76..c5cad6a0433 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/script-tag.http.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -45,23 +45,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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",
@@ -75,13 +85,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -105,33 +115,23 @@
           },
           {
             "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-http",
-            "redirection": "keep-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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html
index c353e26d81d..a24ee872ad7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/sharedworker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html
index fded5a2a20c..7e6e8f3c5f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html
index 2fcb84fa544..ae453ee0f00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/worker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html
index c9384a47189..b3380b89ba3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.http-rp/unset/xhr.http.html
@@ -15,123 +15,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-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 cross-http origin and swap-origin redirection from http context."
+            "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": "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
index 833f8e17b9f..053832d237d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag.http.html
@@ -26,23 +26,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
index fc8f1d9f52d..fbff2ccc7dc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -46,93 +46,93 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
index 8706574d567..94de097619e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -56,83 +56,83 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
-            "redirection": "keep-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 cross-http origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
index 630042379e7..87ed2485e47 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag.http.html
@@ -17,82 +17,82 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,23 +106,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
index a864a9eacf4..b32b60eee96 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag.http.html
@@ -16,53 +16,53 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -76,23 +76,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
@@ -106,13 +106,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html
index 966ce534236..1fb406cc876 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
index 1ba3a910fe4..ba439701ab4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr.http.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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-http origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -96,33 +96,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html
index e6245bb6147..3760f51c6d3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html
index 05ddd541634..046e853074e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/fetch.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html
index 15842a1098b..3954e67fffb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "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 omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html
index 3182275440d..e3720a2df7e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/img-tag.http.html
@@ -17,32 +17,32 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -56,83 +56,83 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html
index eac102ac92e..0bb90ddc538 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/script-tag.http.html
@@ -16,23 +16,33 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "script-tag",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -56,13 +66,13 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -76,43 +86,33 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "script-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -126,13 +126,13 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html
index c90577a54ed..b0a58ec0711 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html
index 4852ee335aa..0de18a801eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html
index 1033835e94f..61ef7547b32 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html
index a8e93024a28..b90c47fb4a9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html
index 9eac0101d9a..365ae53ee9e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/no-referrer/xhr.http.html
@@ -17,42 +17,52 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -76,23 +86,23 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -106,33 +116,23 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html
index 7ecd1c9eb82..c90fbac8471 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag.http.html
@@ -26,23 +26,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html
index e8cb3a68a6b..026d1127cf7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch.http.html
@@ -16,16 +16,6 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -36,53 +26,53 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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",
-            "origin": "same-http",
+            "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 same-http 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",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
@@ -97,6 +87,16 @@
           {
             "expectation": "origin",
             "origin": "same-https",
+            "redirection": "keep-origin",
+            "source_context_list": [],
+            "source_scheme": "http",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
@@ -106,33 +106,33 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
index dac3ff42c3a..ac41652006d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html
index 2fd0aaa8389..c359cedf9dd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag.http.html
@@ -17,32 +17,32 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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 same-http origin and keep-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -56,23 +56,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-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": "origin",
@@ -86,43 +86,43 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and keep-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html
index 1ecb302d713..e85254c9c29 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
@@ -36,43 +36,43 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -86,43 +86,43 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
index 72dafdf510d..164e5a5d6f8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
index 0d7647f69ee..f63136bb9f4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html
index 99db87bbfb6..38f8569c461 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr.http.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -86,33 +86,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "xhr",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -133,6 +123,16 @@
             "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."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "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-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag.http.html
index 0f3871d3e2a..9eed6b4cc56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/a-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-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": "origin",
@@ -46,13 +46,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch.http.html
index aba770d8bd1..9e0eb9df863 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/fetch.http.html
@@ -16,103 +16,103 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "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 origin 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -127,12 +127,12 @@
           {
             "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 origin 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html
index cc5a0b4bacd..b2de0586e5c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/iframe-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-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": "origin",
@@ -66,13 +66,13 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -86,43 +86,43 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "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 origin for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-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": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag.http.html
index dc8bdd9a60c..0be153073e4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/img-tag.http.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect 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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -87,52 +87,52 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http 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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag.http.html
index 8b4bf54aa12..1dd703daa8d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/script-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin 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": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect 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": "origin",
-            "origin": "cross-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 origin for script-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module.http.html
index 3e1a50e4627..f5d00f8139f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr.http.html
index 9b11e25cbb1..ce3c63264f2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/origin/xhr.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "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 origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html
index 685a0fdfa10..e527be69a2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/a-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html
index 9a8a0fcd699..c9edccb7b0b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/fetch.http.html
@@ -17,42 +17,42 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -65,24 +65,24 @@
             "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -95,24 +95,24 @@
             "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin 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-http",
-            "redirection": "keep-origin",
+            "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 keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html
index 5bde564c1b9..cffe9aaf42a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/iframe-tag.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -36,13 +36,13 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -57,42 +57,32 @@
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "iframe-tag",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "stripped-referrer",
-            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -113,6 +103,16 @@
             "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."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "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-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html
index d6268606e6d..169b379a306 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/img-tag.http.html
@@ -17,12 +17,12 @@
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -36,43 +36,43 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -85,34 +85,34 @@
             "test_description": "Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html
index e2bc9e850be..f85b8d09ee7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/script-tag.http.html
@@ -16,83 +16,83 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "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-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -105,14 +105,14 @@
             "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html
index 6f09609ee73..dc152cf203b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html
index 6e98fc0a9a7..4af9a84e38f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/sharedworker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html
index 31351fc0b37..238e044777c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html
index 7be1046e26f..e12a18771c0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html
index 5a0bcc62a17..f806606e39a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/same-origin/xhr.http.html
@@ -26,93 +26,93 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
+            "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin 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": "omitted",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html
index 31b591a3803..c90830faece 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag.http.html
@@ -16,33 +16,33 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to same-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for a-tag to cross-https 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
index e005fb26f39..76475a2a487 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch.http.html
@@ -17,22 +17,12 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
-            "source_context_list": [],
-            "source_scheme": "http",
-            "subresource": "fetch",
-            "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
-          },
-          {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -46,53 +36,53 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
@@ -106,23 +96,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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",
@@ -133,6 +123,16 @@
             "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."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "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-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html
index 45f24b7b973..261b31cea30 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag.http.html
@@ -16,33 +16,33 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -56,23 +56,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -87,52 +87,52 @@
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https 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": "keep-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 keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-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-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
index a4596ccfa9d..f84e23faa9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag.http.html
@@ -16,16 +16,6 @@
         [
           {
             "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 origin for img-tag to cross-https origin and no-redirect redirection from http context."
-          },
-          {
-            "expectation": "origin",
             "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [],
@@ -45,24 +35,14 @@
             "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "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-http origin and no-redirect redirection from http context."
-          },
-          {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -76,23 +56,23 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -105,14 +85,14 @@
             "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",
+            "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 keep-origin 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": "origin",
@@ -133,6 +113,26 @@
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
             "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-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-http origin and keep-origin redirection from http context."
+          },
+          {
+            "expectation": "stripped-referrer",
+            "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-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html
index 8e2bcdb2f5b..692ccd81562 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag.http.html
@@ -15,84 +15,84 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and swap-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",
-            "origin": "same-http",
+            "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 same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https 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": "origin",
@@ -106,33 +106,33 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
index ec8e3c39f74..dca75da7bcd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
index a6b03ca6115..fe4cb622a09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html
index 1bf1915b254..38136d1dfa1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -36,93 +36,93 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html
index 6b6ef4f0201..a0d7b82ff0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/a-tag.http.html
@@ -16,23 +16,23 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "a-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html
index c69a1913072..e4a723a0286 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/fetch.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html
index 6991bab2152..a9a3f08183d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http 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": "origin",
-            "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 origin for iframe-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for iframe-tag to cross-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."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html
index 01fb229751a..61caa7b5deb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/img-tag.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-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": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin 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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-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 origin for img-tag to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect 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": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html
index 9394ebd19d9..f8502d76ec4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/script-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect 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": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for script-tag to cross-https 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "script-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html
index 049341ced7f..6950b050074 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html
index 73911039d94..08fe4b8add0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/strict-origin/xhr.http.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -86,53 +86,53 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html
index 84799d5c548..f25dfbc5fd9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/a-tag.http.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "cross-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 cross-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html
index 895257a0c46..46eb2b9d879 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/fetch.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and keep-origin redirection from http context."
+            "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-http",
+            "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-http origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
+            "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 keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html
index f9d2e150742..f84dba48150 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag.http.html
@@ -16,123 +16,123 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "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-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html
index 08ae5b9c2d7..8f8b278cff6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/img-tag.http.html
@@ -17,122 +17,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
+            "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 cross-https origin and keep-origin 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": "cross-http",
+            "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 cross-http origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html
index cc7d0d28e6c..b99cb1a6363 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/script-tag.http.html
@@ -16,93 +16,93 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-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 same-http origin and swap-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-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-https origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "no-redirect",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -116,23 +116,23 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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 cross-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html
index ab217c7207f..0d76a82ae5b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html
index 2f09cbe2abf..2725051576f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/worker-module.http.html
@@ -17,22 +17,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html
index a9e88dcd4b9..b77d9ed3dff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unsafe-url/xhr.http.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -36,33 +36,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-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-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -76,63 +76,63 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-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 cross-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": "cross-http",
-            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "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-http",
+            "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 no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag.http.html
index f0653a3528e..67702eb9257 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/a-tag.http.html
@@ -15,43 +15,43 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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-https origin and no-redirect redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "cross-http",
+            "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 cross-http 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch.http.html
index b60e74b6c8d..5c2ed3836d1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/fetch.http.html
@@ -16,122 +16,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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-https",
+            "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-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 cross-http origin and swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
index 1c5b7385a88..26d595fcc6b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/iframe-tag.http.html
@@ -16,42 +16,42 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "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": "same-http",
-            "redirection": "no-redirect",
+            "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 same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -66,72 +66,72 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-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 cross-https origin and keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "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 swap-origin 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": "keep-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 keep-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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "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 cross-http origin and keep-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag.http.html
index 1654461c435..0827ebde9c3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/img-tag.http.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "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": "keep-origin",
+            "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 keep-origin redirection from http context."
+            "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": "no-redirect",
+            "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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -56,6 +56,16 @@
           {
             "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",
@@ -96,12 +106,12 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -115,23 +125,13 @@
           },
           {
             "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-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag.http.html
index cf83690a716..c5cad6a0433 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/script-tag.http.html
@@ -16,122 +16,122 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "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 swap-origin redirection from http context."
+            "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": "same-http",
-            "redirection": "keep-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 same-http origin and keep-origin redirection from http context."
+            "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": "same-http",
+            "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 same-http origin and swap-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "swap-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 same-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-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-http origin and keep-origin redirection from http context."
+            "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": "same-https",
-            "redirection": "keep-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 same-https origin and keep-origin redirection from http context."
+            "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": "cross-http",
-            "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 cross-http 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": "cross-https",
+            "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 cross-https origin and no-redirect 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "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-http",
-            "redirection": "no-redirect",
+            "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 stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-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 cross-https origin and swap-origin redirection from http context."
+            "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": "cross-https",
-            "redirection": "keep-origin",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html
index befe32ab221..1bc6f04b8cc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html
index c353e26d81d..a24ee872ad7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/sharedworker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for sharedworker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html
index fded5a2a20c..7e6e8f3c5f6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-classic.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module.http.html
index 2fcb84fa544..ae453ee0f00 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/worker-module.http.html
@@ -16,22 +16,22 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr.http.html
index f08273542e3..b3380b89ba3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/top.meta/unset/xhr.http.html
@@ -15,23 +15,13 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "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 same-http origin and keep-origin 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."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -45,33 +35,33 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "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-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "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 same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -85,13 +75,13 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and keep-origin 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",
@@ -105,33 +95,43 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "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 cross-https origin and keep-origin redirection from http context."
+            "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-http",
-            "redirection": "swap-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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "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 cross-http origin and swap-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html
index 40d2dfb5369..235b568eddb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,7 +33,7 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -58,8 +58,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html
index 31ecb964c1d..049f06c7538 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -121,7 +121,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "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 keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,7 +180,7 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -205,7 +205,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html
index f0b5085cf01..7fd76e63435 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,7 +33,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -58,7 +58,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html
index 838618abcef..5bec21542b2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html
index 780d2972088..c86c9717eb4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/no-referrer/xhr.http.html
@@ -37,7 +37,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html
index 04f7ee6382a..10e759bb299 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/fetch.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,11 +33,11 @@
             "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 cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,7 +159,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -184,8 +184,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html
index 2f28f3d8295..742aa6f0d9f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html
index 561073b6b8b..42da073f505 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html
index ddb97f3b637..963b15df342 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin-when-cross-origin/xhr.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
@@ -121,8 +121,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -163,8 +163,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin 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",
+            "expectation": "origin",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,7 +201,7 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -225,9 +225,9 @@
             "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html
index e3982122d76..79d633daa87 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html
index 4dcff21a091..537dc9dc1eb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html
index bfb8ac96308..16f0cebaa56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -79,7 +79,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,7 +96,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
@@ -121,8 +121,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html
index b1efc9672c8..713d3a3b0fa 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/fetch.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html
index cfff603d4d9..e2a74bd5e9a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html
index 6a2a9ed930c..395bb5f62e0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/same-origin/xhr.http.html
@@ -15,8 +15,8 @@
       TestCase(
         [
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http 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": "omitted",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http 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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html
index d2e8af227ee..c5ff91bc677 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "origin",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,7 +117,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http 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": "origin",
@@ -142,8 +142,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "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 swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect 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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
index fb4a59d83e8..6546fe5ecf0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html
index ad719d3f3a4..81a35cb9da8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html
index 0c3b514d58d..e86f975b27d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin-when-cross-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
@@ -225,9 +225,9 @@
             "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http 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",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html
index ab28d7dfc1b..9f866a2ec0e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-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": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html
index 12a5daa5b55..f737d900f6c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/strict-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -163,7 +163,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html
index d6abf201b65..39790d452f1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html
index d271abcace7..0f6f2140f37 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html
index dff929b908b..7ef0c81886e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html
index 3b50f13b0b0..31ffe149743 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unsafe-url/xhr.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
index d9e05ec3e3c..3d3478ff997 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/fetch.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,11 +117,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -132,12 +132,12 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "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-https origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "keep-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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -177,7 +177,7 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
index c8c71ad1141..ff58f802a4f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-classic.http-rp/unset/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "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 stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -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 keep-origin redirection from http context."
+            "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-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-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-https origin and swap-origin 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": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "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-https origin and keep-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."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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": "no-redirect",
+            "redirection": "keep-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 no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-https origin and swap-origin redirection from http context."
+            "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-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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-http origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html
index e3de0eb5f94..fe1a3d25a09 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/fetch.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "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 stripped-referrer for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,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 no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html
index 81a9bb8d583..a2a28d57603 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer-when-downgrade/xhr.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,12 +96,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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "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 swap-origin redirection from http context."
+            "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": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,11 +159,11 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "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 no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,12 +201,12 @@
             "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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html
index bba8c1788e6..bc8b3cdf0ca 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -226,7 +226,7 @@
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html
index 032d948c89a..19eadf3a673 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html
index b07e2f9a90a..0d4d12fa3bd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/no-referrer/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,11 +33,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html
index a35fdd9887a..bfd1aafab07 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,11 +117,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect 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": [
@@ -180,7 +180,7 @@
             "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": "origin",
@@ -206,7 +206,7 @@
           {
             "expectation": "origin",
             "origin": "same-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html
index d5b545dfe37..6ca8eead21e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html
index 8dfca7cabd9..8547c16770d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin-when-cross-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https 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": [
@@ -180,12 +180,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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html
index faeee3e8339..b8d7d630bbd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/fetch.http.html
@@ -37,7 +37,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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": "origin",
             "origin": "cross-https",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
@@ -226,8 +226,8 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-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": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html
index cf8d43536cb..c62b9a29245 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-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": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,7 +75,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-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": "origin",
@@ -100,7 +100,7 @@
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,11 +201,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html
index 28cb174a080..cc62412da81 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "omitted",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,7 +138,7 @@
             "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 omitted for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
@@ -162,9 +162,9 @@
             "test_description": "Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 omitted for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-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": "omitted",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for fetch to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html
index 3375dce27f3..13562c5ddbc 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html
index c4fdc4fe403..ed65b9b4d22 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/same-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "omitted",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 omitted for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "expectation": "omitted",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 omitted for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "omitted",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "omitted",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http 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": "omitted",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,7 +222,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects omitted for xhr to cross-http origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html
index 92ec668fcf9..506b3ab3c2f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-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",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,12 +75,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -159,11 +159,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and swap-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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -180,11 +180,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -201,7 +201,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -225,8 +225,8 @@
             "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context."
           },
           {
-            "expectation": "origin",
-            "origin": "same-https",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and keep-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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html
index 1ca4d61d376..06f70620262 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html
index 8ee62364f20..579e294ff06 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin-when-cross-origin/xhr.http.html
@@ -36,9 +36,9 @@
             "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
-            "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "expectation": "origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
@@ -80,7 +80,7 @@
           {
             "expectation": "origin",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,12 +96,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-origin 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",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "expectation": "origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
             "origin": "same-https",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https 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": "origin",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
+            "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,12 +243,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin 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": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "expectation": "stripped-referrer",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html
index 3ef2a1dd2f6..1e0c95fcdbb 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/fetch.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "swap-origin",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,11 +54,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https 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": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-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": "origin",
             "origin": "cross-https",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,11 +222,11 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for fetch to cross-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": "origin",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -243,7 +243,7 @@
             "source_scheme": "http",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html
index 52e252fb8a9..5e81e09fbb0 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html
index 54ab3755fd4..c0d370e8e9d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/worker-module.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html
index 4f0e18b5331..2751a743d15 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/strict-origin/xhr.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "cross-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,11 +75,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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 swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -96,11 +96,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http 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": "origin",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-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": "origin",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,11 +138,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and keep-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": "origin",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -159,12 +159,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "origin",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "origin",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-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": "origin",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin 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": "origin",
-            "origin": "cross-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "source_scheme": "http",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html
index 00eacc02afd..b07a1144da8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/fetch.http.html
@@ -37,8 +37,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,11 +117,11 @@
             "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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
+            "origin": "cross-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -138,12 +138,12 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,12 @@
             "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 keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for fetch to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for fetch to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for fetch to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html
index 1dd2b944a5f..f5f0fd461b6 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -33,12 +33,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,7 +54,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html
index b2a3eea3c3c..2c1f53cd9ad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unsafe-url/xhr.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -33,12 +33,12 @@
             "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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -54,12 +54,12 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -75,12 +75,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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -96,11 +96,11 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -117,12 +117,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 cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -138,12 +138,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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -159,12 +159,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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -180,12 +180,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 stripped-referrer for xhr to same-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -201,12 +201,12 @@
             "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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -222,12 +222,12 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -243,11 +243,11 @@
             "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 stripped-referrer for xhr to same-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "same-https",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -264,7 +264,7 @@
             "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 stripped-referrer for xhr to same-https origin and swap-origin redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
index 7909b673ab8..790fcc5963b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/fetch.http.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,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 stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "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 stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
+            "origin": "cross-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "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 cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-https",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "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 stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,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 stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,12 @@
             "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 stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "same-http",
+            "redirection": "keep-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 cross-http origin and swap-origin 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-http",
-            "redirection": "swap-origin",
+            "redirection": "no-redirect",
             "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 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."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "same-http",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -147,11 +147,11 @@
             "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 stripped-referrer for fetch to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -162,12 +162,12 @@
             "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 stripped-referrer for fetch to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "no-redirect",
             "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 cross-http origin and keep-origin redirection from http context."
+            "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": "no-redirect",
+            "redirection": "swap-origin",
             "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 no-redirect redirection from http context."
+            "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/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html
index 5ffb93d77d3..5c1625fb70e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/worker-classic.http.html
@@ -17,7 +17,7 @@
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "no-redirect",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "same-http",
-            "redirection": "keep-origin",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "http",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context."
+            "test_description": "Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
index 71ac7329b7b..da200bb87ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/gen/worker-module.http-rp/unset/xhr.http.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "keep-origin",
             "source_context_list": [
               {
@@ -27,12 +27,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 stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "swap-origin",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "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 cross-http origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
             "origin": "cross-http",
-            "redirection": "no-redirect",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "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 stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "swap-origin",
+            "origin": "cross-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "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 stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-http",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "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 stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-https",
-            "redirection": "keep-origin",
+            "origin": "cross-https",
+            "redirection": "swap-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,12 +102,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 stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "no-redirect",
+            "origin": "same-http",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -117,7 +117,7 @@
             "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 stripped-referrer for xhr to same-http origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -136,7 +136,7 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
+            "origin": "same-http",
             "redirection": "swap-origin",
             "source_context_list": [
               {
@@ -147,12 +147,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 stripped-referrer for xhr to same-http origin and swap-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "same-http",
-            "redirection": "swap-origin",
+            "origin": "same-https",
+            "redirection": "keep-origin",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -162,7 +162,7 @@
             "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 stripped-referrer for xhr to same-https origin and keep-origin redirection from http context."
           },
           {
             "expectation": "stripped-referrer",
@@ -181,8 +181,8 @@
           },
           {
             "expectation": "stripped-referrer",
-            "origin": "cross-https",
-            "redirection": "keep-origin",
+            "origin": "same-https",
+            "redirection": "swap-origin",
             "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 cross-https origin and keep-origin redirection from http context."
+            "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/tests/wpt/web-platform-tests/remote-playback/idlharness.window.js b/tests/wpt/web-platform-tests/remote-playback/idlharness.window.js
index ba40f199633..458bfd0c608 100644
--- a/tests/wpt/web-platform-tests/remote-playback/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/remote-playback/idlharness.window.js
@@ -1,6 +1,7 @@
 // META: script=/resources/WebIDLParser.js
 // META: script=/resources/idlharness.js
 // META: script=/common/media.js
+// META: timeout=long
 
 'use strict';
 
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html
new file mode 100644
index 00000000000..a6d34bfff12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-with-position-under-clip-path.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<title>Test: x & y on foreignObject don't transform a clipPath with clipPathUnits="objectBoundingBox"</title>
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-ForeignObjectElement">
+<link rel="match" href="foreign-object-size-ref.html">
+<svg>
+  <defs>
+    <clipPath id="clip" clipPathUnits="objectBoundingBox">
+      <rect width="1" height="0.5" />
+    </clipPath>
+  </defs>
+  <g transform="translate(-50 -50)">
+    <foreignObject x="50" y="50" width="100" height="200" clip-path="url(#clip)">
+      <html xmlns="http://www.w3.org/1999/xhtml">
+      <body>
+        <div style="background: green; height: 100px;"></div>
+        <div style="background: red; height: 100px;"></div>
+      </body>
+      </html>
+    </foreignObject>
+  </g>
+</svg>
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index e195fc0cff4..3fbfbfaac81 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -86,6 +86,7 @@ def browser_kwargs(test_type, run_info_data, config, **kwargs):
             "ca_certificate_path": config.ssl_config["ca_cert_path"],
             "e10s": kwargs["gecko_e10s"],
             "enable_webrender": kwargs["enable_webrender"],
+            "enable_fission": kwargs["enable_fission"],
             "stackfix_dir": kwargs["stackfix_dir"],
             "binary_args": kwargs["binary_args"],
             "timeout_multiplier": get_timeout_multiplier(test_type,
@@ -174,7 +175,7 @@ def run_info_extras(**kwargs):
           "verify": kwargs["verify"],
           "headless": kwargs.get("headless", False) or "MOZ_HEADLESS" in os.environ,
           "sw-e10s": True,
-          "fission": get_bool_pref("fission.autostart")}
+          "fission": kwargs.get("enable_fission") or get_bool_pref("fission.autostart")}
 
     # The value of `sw-e10s` defaults to whether the "parent_intercept"
     # implementation is enabled for the current build. This value, however,
@@ -502,13 +503,14 @@ class OutputHandler(object):
 
 class ProfileCreator(object):
     def __init__(self, logger, prefs_root, config, test_type, extra_prefs, e10s,
-                 browser_channel, binary, certutil_binary, ca_certificate_path):
+                 enable_fission, browser_channel, binary, certutil_binary, ca_certificate_path):
         self.logger = logger
         self.prefs_root = prefs_root
         self.config = config
         self.test_type = test_type
         self.extra_prefs = extra_prefs
         self.e10s = e10s
+        self.enable_fission = enable_fission
         self.browser_channel = browser_channel
         self.ca_certificate_path = ca_certificate_path
         self.binary = binary
@@ -578,6 +580,9 @@ class ProfileCreator(object):
         if self.e10s:
             profile.set_preferences({"browser.tabs.remote.autostart": True})
 
+        if self.enable_fission:
+            profile.set_preferences({"fission.autostart": True})
+
         if self.test_type == "reftest":
             profile.set_preferences({"layout.interruptible-reflow.enabled": False})
 
@@ -645,10 +650,10 @@ class FirefoxBrowser(Browser):
 
     def __init__(self, logger, binary, prefs_root, test_type, extra_prefs=None, debug_info=None,
                  symbols_path=None, stackwalk_binary=None, certutil_binary=None,
-                 ca_certificate_path=None, e10s=False, enable_webrender=False, stackfix_dir=None,
-                 binary_args=None, timeout_multiplier=None, leak_check=False, asan=False,
-                 stylo_threads=1, chaos_mode_flags=None, config=None, browser_channel="nightly",
-                 headless=None, preload_browser=False, **kwargs):
+                 ca_certificate_path=None, e10s=False, enable_webrender=False, enable_fission=False,
+                 stackfix_dir=None, binary_args=None, timeout_multiplier=None, leak_check=False,
+                 asan=False, stylo_threads=1, chaos_mode_flags=None, config=None,
+                 browser_channel="nightly", headless=None, preload_browser=False, **kwargs):
         Browser.__init__(self, logger)
 
         self.logger = logger
@@ -671,6 +676,7 @@ class FirefoxBrowser(Browser):
                                          test_type,
                                          extra_prefs,
                                          e10s,
+                                         enable_fission,
                                          browser_channel,
                                          binary,
                                          certutil_binary,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
index 50f8504f8e0..a6cb8f0dd3e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -87,10 +87,10 @@ def env_options():
 
 class ProfileCreator(FirefoxProfileCreator):
     def __init__(self, logger, prefs_root, config, test_type, extra_prefs, e10s,
-                 browser_channel, certutil_binary, ca_certificate_path):
+                 enable_fission, browser_channel, certutil_binary, ca_certificate_path):
         super(ProfileCreator, self).__init__(logger, prefs_root, config, test_type, extra_prefs,
-                                             e10s, browser_channel, None, certutil_binary,
-                                             ca_certificate_path)
+                                             e10s, enable_fission, browser_channel, None,
+                                             certutil_binary, ca_certificate_path)
 
     def _set_required_prefs(self, profile):
         profile.set_preferences({
@@ -162,6 +162,7 @@ class FirefoxAndroidBrowser(Browser):
                                               test_type,
                                               extra_prefs,
                                               e10s,
+                                              False,
                                               browser_channel,
                                               certutil_binary,
                                               ca_certificate_path)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 8125700b4bf..93bd886aac1 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -273,6 +273,10 @@ scheme host and port.""")
                              help="Enable the WebRender compositor in Gecko (defaults to disabled).")
     gecko_group.add_argument("--no-enable-webrender", dest="enable_webrender", action="store_false",
                              help="Disable the WebRender compositor in Gecko.")
+    gecko_group.add_argument("--enable-fission", dest="enable_fission", action="store_true", default=None,
+                             help="Enable fission in Gecko (defaults to disabled).")
+    gecko_group.add_argument("--no-enable-fission", dest="enable_fission", action="store_false",
+                             help="Disable fission in Gecko.")
     gecko_group.add_argument("--stackfix-dir", dest="stackfix_dir", action="store",
                              help="Path to directory containing assertion stack fixing scripts")
     gecko_group.add_argument("--setpref", dest="extra_prefs", action='append',
diff --git a/tests/wpt/web-platform-tests/touch-events/idlharness.window.js b/tests/wpt/web-platform-tests/touch-events/idlharness.window.js
index f88c9aab27f..88573286a27 100644
--- a/tests/wpt/web-platform-tests/touch-events/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/touch-events/idlharness.window.js
@@ -7,7 +7,7 @@
 
 idl_test(
   ['touch-events'],
-  ['uievents', 'dom', 'html'],
+  ['uievents', 'html', 'dom'],
   idl_array => {
     idl_array.add_objects({
       Document: ['document'],
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html
index 3956569f06d..b601fbbf3db 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html
index 01e109324ed..fbc73e5872a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/iframe-tag.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html
index bb7411da5c5..b7b4ba03ee3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/img-tag.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html
index 552e5f9b843..3d9fc6eeb92 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-classic.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html
index 7a4503da061..0f345eb901e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-import-data.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html
index 7e41d9105bb..c58a8b741c8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/sharedworker-module.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html
index 75f5773e1d6..abc67d75024 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-classic.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html
index 249fdd86bc8..f61176cda2b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -61,7 +61,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html
index bea5b9d881d..e82a6917d97 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worker-module.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html
index 42aada4af14..7b54ed289ef 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html
index 273ae64994e..1d7e1fe5982 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-animation.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -90,7 +90,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html
index ed144330daa..81a4e8a2f83 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio-import-data.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html
index 73a374c2f66..0aed1e59ac6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-audio.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html
index d12705e3136..c143066c787 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout-import-data.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html
index 353c760e44f..3095104f855 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-layout.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html
index b6cd672f9f0..c7d7f35d130 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html
index d49143ee6b7..43892ec2845 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/worklet-paint.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html
index 40bfeba1921..dd17493029e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/unset/xhr.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html
index d02f4377fec..24d3ed9946b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/fetch.https.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html
index 4705c84bf38..57fec0607ed 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/iframe-tag.https.html
@@ -46,8 +46,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html
index cf105651f49..0639eb49fc5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/img-tag.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html
index 28c0a307ca8..5e59b508df0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-classic.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html
index f082fc98d25..6132933adfb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,7 +76,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html
index 5286a0687dc..2d48b7037bd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/sharedworker-module.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html
index acacd6bacab..a2e6ad6cafc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/websocket.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html
index 83011e09d19..b707f78738d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-classic.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html
index 1b817a46f78..d66684ecee5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,11 +72,11 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,7 +87,7 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html
index c5a23c3ee71..2207fcded26 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worker-module.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html
index 8b763f3bad9..78b39da45b4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,8 +46,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html
index 57c8bbcfe7c..b560ec687e7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-animation.https.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,7 +87,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html
index 4878d8b69f4..4098618e827 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio-import-data.https.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html
index b856c3c824a..9dd58b98ab7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-audio.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,7 +87,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html
index 1a88250516c..5690227c438 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -61,8 +61,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html
index 892e925e02a..07aecb67431 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-layout.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html
index ea72cad04a1..0bfe4cbfa4c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint-import-data.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html
index 22fc143db2d..887fe458cda 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/worklet-paint.https.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html
index 7d0ff6e1a37..de3a6213649 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/iframe-blank-inherit.meta/upgrade/xhr.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html
index b65bb8451f0..4184e7c158c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html
index f1933b620e9..c41e4cde41f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html
index 026d771dd7f..62a5883cadb 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,8 +45,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html
index 95c36dab703..2a7dbda8b59 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html
index 89ab0fe4ef9..fa60413af5e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html
index eea46ce9648..fb39f9bc5c8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html
index c0447cf3c02..d5f9b891b5c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html
index eef8276f29e..1d8b60fea6c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -120,7 +120,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html
index bd69ccf95c0..bb031af962a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,11 +32,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -53,7 +53,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html
index 6fc52891e28..00c297642fe 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-classic.http-rp/upgrade/xhr.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,11 +53,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -99,8 +99,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html
index ea2320e6ce7..a69ca6ebb13 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -75,8 +75,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html
index 124a03c37f4..df2014e4491 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html
index b04b07adb57..8790654a036 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html
index d6b8cdf4171..9f8b280cf47 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html
index a4798e53a06..98613146348 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html
index 681c1cee442..d71d1f76ed7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html
index b355fd0c14c..63cca40cd25 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html
index befbb210fc8..279e92e9f17 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html
@@ -31,7 +31,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,7 +87,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html
index 4dcb71be9dc..593c92fa506 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -32,12 +32,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -120,7 +120,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html
index 697ca251490..d307b33c491 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/sharedworker-module.http-rp/upgrade/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -57,8 +57,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,11 +74,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html
index 24c133ddd6d..f8585f64d36 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html
index d57b8fe04af..8b63807eaae 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/iframe-tag.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -61,7 +61,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html
index a44e08e94cf..e7eb4050e2e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/img-tag.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html
index 2782a740cd4..89db3b1be91 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-classic.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html
index f375867070e..6e61de3bc4a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/sharedworker-import-data.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html
index 7855319f611..dfc63fe9b0a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html
index b7a91ecf977..819ef182e91 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-classic.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html
index cc301145a9f..c060b0196da 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html
index ccb9304d8f8..0282683b9d0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worker-module.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html
index c1035e2b419..0692fb893c6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html
index d4b8cff3077..7ec880806de 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-animation.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -90,8 +90,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html
index 087bb054562..40160b4fef1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html
index 86907e4a8ea..8dbc7012eda 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-audio.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,8 +60,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html
index 285cefce45d..c2808ac643c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout-import-data.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html
index b6b3c5a3182..cc19e2775c8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-layout.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html
index 58f6bc766a3..3ba203f3f9c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint-import-data.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,7 +45,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html
index b456950c1de..62a48a16615 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/worklet-paint.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html
index 86da59ba5ba..3b5047d512a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/unset/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html
index bf99774df65..117e32f3f50 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/fetch.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,8 +91,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html
index e6e4fa8908b..679cb54eb29 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/iframe-tag.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html
index 988adafc494..e9744a3aec0 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/img-tag.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,8 +46,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html
index d1baacbc70b..3be481acf37 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-classic.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html
index 0c9819b8161..cbd2fabdea7 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-import-data.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,7 +87,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html
index 946ba63f6de..91e6ecd08e2 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/sharedworker-module.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html
index 4081c6525f2..c7f3c265d8c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/websocket.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html
index 64c5cdec3d0..7c0677a61c9 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-classic.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html
index 2fc6ecad5c8..f90e9bd4a8d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html
index 6b749b48437..ccd461add22 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worker-module.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html
index ed00a2bd9da..c34a6d07822 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation-import-data.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -91,7 +91,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html
index 34332639c88..6be85c5e452 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-animation.https.html
@@ -31,7 +31,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,11 +72,11 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -87,7 +87,7 @@
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html
index 14185885554..b0ee36fa6ff 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio-import-data.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html
index b31f83c03ee..9636d3f5574 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-audio.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html
index cbd1d2d42eb..a0b031e4991 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html
index bade461aedf..663d0b8238e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-layout.https.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html
index 4ea2a00137b..48d31775224 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint-import-data.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html
index 3f7ce8c9b25..69a4c90ec61 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/worklet-paint.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html
index 3b54477e628..c326a816618 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/srcdoc-inherit.meta/upgrade/xhr.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -61,7 +61,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html
index f7e759e42a2..ff9f627f551 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/fetch.https.html
@@ -16,42 +16,42 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -65,13 +65,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html
index 063dc6b03ba..d78bcbd8010 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/iframe-tag.https.html
@@ -15,63 +15,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html
index f74ae12454a..9950b5b5f51 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/img-tag.https.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -55,23 +55,23 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html
index c2cb50c2a81..677dfad7162 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-classic.https.html
@@ -16,32 +16,32 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html
index 30371909423..7e268a47af4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-import-data.https.html
@@ -25,53 +25,53 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html
index 937b0861707..4e20a8ab3df 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/sharedworker-module.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -35,13 +35,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html
index 41cbef5d00a..5573cace640 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/websocket.https.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html
index e26c46dda1d..85e1a9c08fe 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-import-data.https.html
@@ -25,23 +25,23 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -65,13 +65,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html
index 4bbea1361bf..5b0dc16408f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worker-module.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -35,13 +35,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html
index 67101f6d19c..a485bfc5090 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation-import-data.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -35,43 +35,43 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html
index ba7103686aa..511ff4625c1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-animation.https.html
@@ -25,13 +25,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html
index 83bd2f0a2ba..5822f29c88b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio-import-data.https.html
@@ -15,63 +15,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html
index 1894f57b4c9..296e8af847b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-audio.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -35,43 +35,43 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html
index f640d2539e4..b7546cc6113 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout-import-data.https.html
@@ -16,32 +16,32 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -55,13 +55,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html
index 9d9cc8ac478..3ded6cdf25c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-layout.https.html
@@ -25,13 +25,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html
index 4ecca776aa1..fdc8c9106e6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint-import-data.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -35,43 +35,43 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html
index 823eb862c3c..2646219a989 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/worklet-paint.https.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html
index 9e151850507..c85f01adc1d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.http-rp/upgrade/xhr.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -45,13 +45,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -65,13 +65,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html
index d150ea2d689..39148c015be 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/fetch.https.html
@@ -15,63 +15,63 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html
index 4bfc96fb974..12ef5a5b700 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/iframe-tag.https.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html
index 824eb27e568..a78db7560ad 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/img-tag.https.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,23 +55,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html
index 661eb7d3e3f..4c5295cf7bf 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-classic.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,13 +35,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html
index 83a6bc50fa9..dde524fb0fc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-import-data.https.html
@@ -15,63 +15,63 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html
index 1129964562a..26776e4df76 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/sharedworker-module.https.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for sharedworker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html
index d90bca9dbaf..3669e030836 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-import-data.https.html
@@ -15,63 +15,63 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html
index 29677ccb6b2..6e5cce8af6d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worker-module.https.html
@@ -15,13 +15,13 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -35,13 +35,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html
index e96f2362b17..4ffc90cd8fc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation-import-data.https.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html
index 5f6b73b6335..114f59fbea8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-animation.https.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -65,13 +65,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-animation to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html
index d95fda7f21d..cad1c3580d3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio-import-data.https.html
@@ -35,23 +35,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -65,13 +65,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html
index 413997c64bf..16ce32b7311 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-audio.https.html
@@ -15,23 +15,23 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,33 +45,33 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-audio to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html
index 3fb5e1586f9..a6c633e97d6 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout-import-data.https.html
@@ -25,23 +25,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,23 +55,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html
index 34fdc73d7a3..9c7f82d9e20 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-layout.https.html
@@ -15,16 +15,6 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "worklet-layout",
-            "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
             "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
@@ -45,13 +35,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -65,13 +55,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-layout",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html
index ce44071516f..7b484d0a4c4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint-import-data.https.html
@@ -25,6 +25,16 @@
           },
           {
             "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "worklet-paint-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
             "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
@@ -45,13 +55,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -62,16 +72,6 @@
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
             "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "worklet-paint-import-data",
-            "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html
index e2a567edb18..dcf2a137289 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/worklet-paint.https.html
@@ -15,33 +15,33 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -55,23 +55,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worklet-paint to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html
index 7e05d8ed111..ccb4ecf4acd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/unset/xhr.https.html
@@ -25,53 +25,53 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html
index e7e9d9ee3b0..5b3d886a8aa 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/fetch.https.html
@@ -16,53 +16,53 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html
index 1d93297b18c..76ad9eacc35 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/iframe-tag.https.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "iframe-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for iframe-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html
index d396deba63a..6fe8940e135 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/img-tag.https.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "img-tag",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for img-tag to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html
index dbe808d157a..b8ad00fa477 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-classic.https.html
@@ -26,23 +26,23 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "sharedworker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html
index d265b6ab51f..3ed32403341 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/sharedworker-import-data.https.html
@@ -17,6 +17,16 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [],
+            "source_scheme": "https",
+            "subresource": "sharedworker-import-data",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
@@ -63,16 +73,6 @@
             "subresource": "sharedworker-import-data",
             "subresource_policy_deliveries": [],
             "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to same-https origin and downgrade redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
-            "source_context_list": [],
-            "source_scheme": "https",
-            "subresource": "sharedworker-import-data",
-            "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for sharedworker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html
index 10e5a0b5024..0cb1533b2aa 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-import-data.https.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html
index a3ae8a27475..c6100c45be5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worker-module.https.html
@@ -17,32 +17,32 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html
index 24d5287e293..99b161ff5ef 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation-import-data.https.html
@@ -26,43 +26,43 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html
index 9e3a0e1c993..ddded11818a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-animation.https.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-animation",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-animation to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html
index 1f4a23b1141..99e634cfaef 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio-import-data.https.html
@@ -16,43 +16,43 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -66,13 +66,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html
index 8b096c6ca01..e49a11154c1 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-audio.https.html
@@ -17,62 +17,62 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-audio",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-audio to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html
index e615769653f..c0b3b47918f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout-import-data.https.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html
index 355b275aa45..917e5f064a8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-layout.https.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -36,13 +36,13 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -56,23 +56,23 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-layout",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-layout to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html
index 0e4aede1158..847e38a5365 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint-import-data.https.html
@@ -36,43 +36,43 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint-import-data",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint-import-data to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html
index 3f54a23e9a1..09a5ac2eb73 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/worklet-paint.https.html
@@ -16,13 +16,13 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -36,43 +36,43 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "worklet-paint",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worklet-paint to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html
index 95b1be919fe..4d16491a4df 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/top.meta/upgrade/xhr.https.html
@@ -16,63 +16,63 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [],
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html
index da694db5273..607c6828e43 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/fetch.https.html
@@ -16,7 +16,7 @@
           {
             "expectation": "blocked",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html
index e7bc4c8faba..044aeb16765 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/unset/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html
index be4eaa2efb3..a7e4b9bd7b5 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/fetch.https.html
@@ -16,8 +16,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,7 +46,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html
index 2263b234e6a..5ecc9293b5a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-data.meta/upgrade/xhr.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch.https.html
index c82f6a0ba2d..ee16cdf93cc 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +71,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket.https.html
index 8eeff5b1441..b5c7c6f1114 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module.https.html
index 6fe8db741d2..71b525fd972 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/worker-module.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr.https.html
index 0feb767bbe7..5e15f9fde17 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.http-rp/upgrade/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch.https.html
index d6aa9233bfc..6c530950209 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -79,7 +79,7 @@
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket.https.html
index f3bd83f01b8..781a159d8a4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,11 +32,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -53,7 +53,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic.https.html
index c95f17d7602..9ae574fbbf8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/worker-classic.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -32,7 +32,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -57,7 +57,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr.https.html
index deb51764f46..4362edad04e 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/unset/xhr.https.html
@@ -36,8 +36,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,7 +53,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -78,7 +78,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -95,11 +95,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,12 +116,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch.https.html
index d03bbb7fb76..0544c21008f 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/fetch.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket.https.html
index 9755a3f7d7a..6237b53146c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/websocket.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic.https.html
index 93babaf49e1..abce936167d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/worker-classic.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr.https.html
index 5140fc4800a..7ac3d61e97b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-classic-inherit.meta/upgrade/xhr.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,7 +72,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html
index a3fa13ecfd9..9ff76bc7878 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -60,7 +60,7 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html
index 53dc448d6c4..2d8c1bef7ee 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,7 +41,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html
index 1125fa45434..b406ddd6dab 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,7 +26,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -61,7 +61,7 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,7 +86,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html
index a3cd2146663..4a65c521dfd 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,12 +86,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html
index cc450bfef7a..eaad29b7d47 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,12 +56,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html
index b50873f8085..c0692396730 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,12 +42,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html
index cc0a17b9f1a..5cce5cce985 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -76,8 +76,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch.https.html
index 4cde804eb79..aec22847af3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/fetch.https.html
@@ -15,8 +15,8 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -26,12 +26,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,12 +71,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic.https.html
index 2df83cc4462..f2b6cd67578 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-classic.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module.https.html
index 6b32437c203..b9bb11aa42c 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/worker-module.https.html
@@ -30,8 +30,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,12 +41,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +56,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr.https.html
index ad5f4ff66a4..ba5febfc03a 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.http-rp/upgrade/xhr.https.html
@@ -15,7 +15,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -26,11 +26,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -41,11 +41,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -56,11 +56,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -71,11 +71,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -86,11 +86,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -101,7 +101,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch.https.html
index 6707dc37e42..08af12c5848 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/fetch.https.html
@@ -36,7 +36,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-http-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,11 +74,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -95,12 +95,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
             "origin": "same-http-downgrade",
-            "redirection": "downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -116,11 +116,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -137,7 +137,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic.https.html
index a6a168275fc..cd1cd15697b 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/worker-classic.https.html
@@ -36,8 +36,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,12 +53,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -74,7 +74,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr.https.html
index d1ebd135096..f5c04836c05 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/unset/xhr.https.html
@@ -36,8 +36,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,11 +53,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -74,12 +74,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -95,7 +95,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "blocked",
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch.https.html
index ce81bb79483..dbe7b1460a8 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/fetch.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "cross-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -27,7 +27,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
@@ -46,8 +46,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "cross-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -57,11 +57,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
+            "origin": "same-http-downgrade",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,11 +87,11 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket.https.html
index c7410632e17..a277dfe752d 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/websocket.https.html
@@ -16,7 +16,7 @@
         [
           {
             "expectation": "allowed",
-            "origin": "same-ws-downgrade",
+            "origin": "cross-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -27,11 +27,11 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-ws-downgrade",
+            "origin": "same-ws-downgrade",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -42,7 +42,7 @@
             "source_scheme": "https",
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic.https.html
index 760fd75466f..3baf240f361 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-classic.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-classic",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-classic to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module.https.html
index 5a7168ea992..7bc07b28e28 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/worker-module.https.html
@@ -17,7 +17,7 @@
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -27,12 +27,12 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "same-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,7 +57,7 @@
             "source_scheme": "https",
             "subresource": "worker-module",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for worker-module to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr.https.html b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr.https.html
index cd15c2640ca..9d1a0fe15a4 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr.https.html
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/gen/worker-module-inherit.meta/upgrade/xhr.https.html
@@ -31,8 +31,8 @@
           },
           {
             "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "downgrade",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -42,11 +42,11 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "same-http-downgrade",
+            "origin": "cross-https",
             "redirection": "downgrade",
             "source_context_list": [
               {
@@ -57,12 +57,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
             "origin": "same-http-downgrade",
-            "redirection": "no-redirect",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -72,12 +72,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-https",
-            "redirection": "downgrade",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -87,12 +87,12 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
           },
           {
             "expectation": "allowed",
-            "origin": "cross-http-downgrade",
-            "redirection": "no-redirect",
+            "origin": "same-https",
+            "redirection": "downgrade",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -102,7 +102,7 @@
             "source_scheme": "https",
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
-            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
           }
         ],
         new SanityChecker()
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html
index 0914edbb3b0..ce39de54671 100644
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-onerror.https.html
@@ -24,7 +24,11 @@
             (task, should) => {
               let constructorErrorWorkletNode =
                   new AudioWorkletNode(context, 'constructor-error');
-              constructorErrorWorkletNode.onprocessorerror = () => {
+              constructorErrorWorkletNode.onprocessorerror = (e) => {
+                should(e instanceof ErrorEvent,
+                       `onprocessorerror argument should be an ErrorEvent when
+                        the constructor of AudioWorkletProcessor has
+                        an error.`).beTrue();
                 // Without 'processorerror' event callback, this test will be
                 // timed out.
                 task.done();
@@ -37,7 +41,11 @@
               let processErrorWorkletNode =
                   new AudioWorkletNode(context, 'process-error');
               processErrorWorkletNode.connect(context.destination);
-              processErrorWorkletNode.onprocessorerror = () => {
+              processErrorWorkletNode.onprocessorerror = (e) => {
+                should(e instanceof ErrorEvent,
+                       `onprocessorerror argument should be an ErrorEvent when
+                        the process method of the AudioWorkletProcessor method
+                        has an error`).beTrue();
                 // Without 'processorerror' event callback, this test will be
                 // timed out.
                 task.done();