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

tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini

@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-

tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini

@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-

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

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
+

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
+

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
+

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
+

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
+

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
+

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
 

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
+

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
+

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
+

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
+

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
+

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
+

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
+

tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini

@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-

tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini

@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-

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

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
+

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
+

tests/wpt/metadata/encoding/bom-handling.html.ini

@@ -0,0 +1,4 @@
+[bom-handling.html]
+  [document.characterSet should match the BOM]
+    expected: FAIL
+

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 */*]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+

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
+

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
+

tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini

@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-

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
+

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
+

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
 

tests/wpt/metadata/touch-events/idlharness.window.js.ini

@@ -191,6 +191,3 @@
   [HTMLElement interface: attribute ontouchcancel]
     expected: FAIL
 
-  [idl_test setup]
-    expected: FAIL
-

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
+

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
+

tests/wpt/metadata/webmessaging/without-ports/018.html.ini

@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-

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
 

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
 

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>

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>

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>

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>

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>

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>

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>

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) {

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>

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

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

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,""]}]
 ]

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,""]}]
 ]

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>

tests/wpt/web-platform-tests/encoding/bom-handling.html.headers

@@ -0,0 +1 @@
+Content-Type: text/html; charset=windows-1252

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;
 };

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>

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>

tests/wpt/web-platform-tests/largest-contentful-paint/invisible-images-composited.html

@@ -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>

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>

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.');

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>

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",
@@ -73,6 +73,21 @@
             "subresource_policy_deliveries": [],
             "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": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-https",
@@ -88,21 +103,6 @@
             "subresource_policy_deliveries": [],
             "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",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -120,22 +120,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -146,12 +131,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": [],
@@ -161,7 +146,22 @@
             "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": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
           }
         ],
         new SanityChecker()

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()

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,7 +26,52 @@
             "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": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
           },
           {
             "expectation": "blocked",
@@ -43,6 +88,21 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -58,51 +118,6 @@
             "subresource_policy_deliveries": [],
             "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",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -120,8 +135,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -131,12 +146,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 swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -146,22 +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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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()

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()

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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/opt-in/xhr.https.html

@@ -14,6 +14,21 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -43,21 +58,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "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",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/fetch.https.html

@@ -14,8 +14,23 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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,37 @@
             "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": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
           },
           {
             "expectation": "blocked",
@@ -60,7 +105,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -71,22 +116,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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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": "blocked",
@@ -102,36 +132,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "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": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic-data.meta/unset/xhr.https.html

@@ -13,6 +13,36 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -45,8 +75,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -56,7 +86,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 blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -73,6 +103,21 @@
             "subresource_policy_deliveries": [],
             "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": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -87,51 +132,6 @@
             "subresource": "xhr",
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic-data"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/fetch.https.html

@@ -13,174 +13,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "allowed",
             "origin": "same-https",
@@ -222,6 +54,174 @@
             "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": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
           }
         ],
         new SanityChecker()

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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/opt-in/xhr.https.html

@@ -14,8 +14,29 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -32,12 +53,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": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [
@@ -53,7 +74,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",
@@ -99,28 +120,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "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",
@@ -160,6 +160,27 @@
             "subresource_policy_deliveries": [],
             "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": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -182,9 +203,9 @@
             "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": [
@@ -200,28 +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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/fetch.https.html

@@ -13,6 +13,51 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -28,6 +73,21 @@
             "subresource_policy_deliveries": [],
             "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": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -58,36 +118,6 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context."
           },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -102,36 +132,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "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": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-classic.http-rp/unset/websocket.https.html

@@ -13,6 +13,21 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-wss",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-ws",
@@ -42,21 +57,6 @@
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-wss",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

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,7 +26,22 @@
             "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": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
           },
           {
             "expectation": "blocked",
@@ -60,8 +75,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "no-redirect",
+            "origin": "cross-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -71,7 +86,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 blocked for xhr to cross-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -90,37 +105,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-classic"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -131,7 +116,22 @@
             "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": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic"
+              }
+            ],
+            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.http-rp/opt-in/fetch.https.html

@@ -14,8 +14,23 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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,52 +41,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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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",
@@ -88,21 +58,6 @@
             "subresource_policy_deliveries": [],
             "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",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -134,8 +89,23 @@
             "test_description": "Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -146,11 +116,11 @@
             "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 keep-scheme redirection from https context."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
+            "expectation": "blocked",
+            "origin": "same-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -161,7 +131,37 @@
             "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": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
           }
         ],
         new SanityChecker()

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()

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,27 @@
             "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": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
           },
           {
             "expectation": "blocked",
-            "origin": "cross-https",
-            "redirection": "swap-scheme",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -41,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",
@@ -58,6 +73,36 @@
             "subresource_policy_deliveries": [],
             "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": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -88,36 +133,6 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -134,9 +149,9 @@
             "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": [],
@@ -146,22 +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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/fetch.https.html

@@ -14,6 +14,21 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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": "blocked",
             "origin": "cross-http",
@@ -43,21 +58,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "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",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/opt-in/websocket.https.html

@@ -14,6 +14,21 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-wss",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-ws",
@@ -43,21 +58,6 @@
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-wss",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/fetch.https.html

@@ -13,6 +13,66 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -28,6 +88,21 @@
             "subresource_policy_deliveries": [],
             "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",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -57,81 +132,6 @@
             "subresource": "fetch",
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module-data.meta/unset/xhr.https.html

@@ -13,6 +13,66 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -43,36 +103,6 @@
             "subresource_policy_deliveries": [],
             "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",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -90,8 +120,8 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -101,37 +131,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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module-data"
-              }
-            ],
-            "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()

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,28 +78,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "origin": "cross-http",
             "redirection": "no-redirect",
             "source_context_list": [
               {
@@ -116,7 +95,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 blocked for fetch to cross-http origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -162,49 +141,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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",
-            "origin": "same-https",
+            "origin": "same-http",
             "redirection": "keep-scheme",
             "source_context_list": [
               {
@@ -221,7 +158,70 @@
             "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 keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/websocket.https.html

@@ -13,6 +13,27 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-wss",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-ws",
@@ -54,27 +75,6 @@
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-wss",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/opt-in/xhr.https.html

@@ -13,6 +13,48 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -55,6 +97,27 @@
             "subresource_policy_deliveries": [],
             "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": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [
+                  {
+                    "deliveryType": "http-rp",
+                    "key": "mixedContent",
+                    "value": "opt-in"
+                  }
+                ],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-https",
@@ -118,48 +181,6 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context."
           },
-          {
-            "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "swap-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -182,9 +203,9 @@
             "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": [
@@ -200,28 +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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [
-                  {
-                    "deliveryType": "http-rp",
-                    "key": "mixedContent",
-                    "value": "opt-in"
-                  }
-                ],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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()

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,9 +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",
+            "expectation": "blocked",
+            "origin": "same-http",
+            "redirection": "swap-scheme",
             "source_context_list": [
               {
                 "policyDeliveries": [],
@@ -116,22 +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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "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 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()

tests/wpt/web-platform-tests/mixed-content/gen/sharedworker-module.http-rp/unset/websocket.https.html

@@ -13,6 +13,21 @@
     <script>
       TestCase(
         [
+          {
+            "expectation": "allowed",
+            "origin": "same-wss",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-ws",
@@ -42,21 +57,6 @@
             "subresource": "websocket",
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-wss",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
           }
         ],
         new SanityChecker()

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,7 +26,37 @@
             "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": "allowed",
+            "origin": "same-https",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "redirection": "keep-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
           },
           {
             "expectation": "blocked",
@@ -43,6 +73,21 @@
             "subresource_policy_deliveries": [],
             "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": "swap-scheme",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module"
+              }
+            ],
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -75,22 +120,7 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "redirection": "swap-scheme",
             "source_context_list": [
               {
@@ -101,37 +131,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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "no-redirect",
-            "source_context_list": [
-              {
-                "policyDeliveries": [],
-                "sourceContextType": "sharedworker-module"
-              }
-            ],
-            "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()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/audio-tag.https.html

@@ -14,44 +14,24 @@
       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",
-            "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."
-          },
-          {
-            "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."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-http",
-            "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 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",
@@ -75,13 +55,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-https",
+            "origin": "cross-http",
             "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 same-https origin and swap-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-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-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -94,24 +84,34 @@
             "test_description": "Mixed-Content: Expects blocked for audio-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": "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."
           },
           {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "redirection": "keep-scheme",
+            "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 keep-scheme 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": "blocked",
+            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/beacon.https.html

@@ -14,44 +14,24 @@
       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."
-          },
-          {
-            "expectation": "blocked",
-            "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-https origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-https",
-            "redirection": "swap-scheme",
-            "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 allowed for beacon to same-https origin and no-redirect redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -63,6 +43,16 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and keep-scheme redirection from https context."
           },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and no-redirect redirection from https context."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -73,6 +63,26 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for beacon to cross-http origin and swap-scheme redirection from https context."
           },
+          {
+            "expectation": "blocked",
+            "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-https origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http",
+            "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."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -94,24 +104,14 @@
             "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": "keep-scheme",
+            "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."
-          },
-          {
-            "expectation": "allowed",
-            "origin": "same-https",
-            "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-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/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 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."
-          },
-          {
-            "expectation": "blocked",
-            "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-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",
@@ -43,6 +43,26 @@
             "subresource_policy_deliveries": [],
             "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": "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."
+          },
+          {
+            "expectation": "blocked",
+            "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-http origin and swap-scheme redirection from https context."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-https",
@@ -53,16 +73,6 @@
             "subresource_policy_deliveries": [],
             "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",
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -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",
+            "expectation": "blocked",
             "origin": "same-https",
-            "redirection": "no-redirect",
+            "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."
-          },
-          {
-            "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."
+            "test_description": "Mixed-Content: Expects blocked for fetch to same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/img-tag.https.html

@@ -14,44 +14,34 @@
       TestCase(
         [
           {
-            "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 blocked for img-tag to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
+            "expectation": "allowed",
             "origin": "same-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 same-https origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 same-http origin and keep-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",
-            "origin": "same-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 same-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": "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 cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -73,16 +63,6 @@
             "subresource_policy_deliveries": [],
             "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",
-            "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."
-          },
           {
             "expectation": "blocked",
             "origin": "cross-https",
@@ -94,24 +74,44 @@
             "test_description": "Mixed-Content: Expects blocked for img-tag to cross-https 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": "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 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": "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."
+          },
+          {
+            "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 blocked for img-tag to same-http origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag.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": "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."
+          },
+          {
+            "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 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 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": "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 blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -45,13 +55,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "same-http",
+            "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 swap-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-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-https origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -65,13 +85,23 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "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 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": "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 same-http origin and swap-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -82,36 +112,6 @@
             "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."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and keep-scheme redirection from https context."
-          },
-          {
-            "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 allowed for link-css-tag to same-https origin and no-redirect redirection from https context."
-          },
-          {
-            "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 allowed for link-css-tag to same-https origin and keep-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag.https.html

@@ -13,6 +13,46 @@
     <script>
       TestCase(
         [
+          {
+            "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 allowed for link-prefetch-tag 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": "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http",
+            "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 keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and no-redirect redirection from https context."
+          },
           {
             "expectation": "blocked",
             "origin": "cross-http",
@@ -35,23 +75,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-http",
+            "origin": "same-http",
             "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 keep-scheme redirection from https context."
-          },
-          {
-            "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 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 same-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -63,25 +93,15 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context."
           },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and no-redirect redirection from https context."
-          },
           {
             "expectation": "blocked",
             "origin": "same-http",
-            "redirection": "keep-scheme",
+            "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 keep-scheme 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": "blocked",
@@ -92,26 +112,6 @@
             "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."
-          },
-          {
-            "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 allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context."
-          },
-          {
-            "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 allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/object-tag.https.html

@@ -13,86 +13,6 @@
     <script>
       TestCase(
         [
-          {
-            "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 blocked for object-tag to same-http origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 same-http origin and keep-scheme redirection from https context."
-          },
-          {
-            "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 blocked for object-tag to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and keep-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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-https origin and swap-scheme redirection from https context."
-          },
           {
             "expectation": "allowed",
             "origin": "same-https",
@@ -112,6 +32,86 @@
             "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."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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-https origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 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": "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."
+          },
+          {
+            "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 blocked for object-tag to same-http origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/picture-tag.https.html

@@ -13,86 +13,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "blocked",
-            "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-https origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and no-redirect redirection from https context."
-          },
-          {
-            "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 blocked for picture-tag 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": "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."
-          },
-          {
-            "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 blocked for picture-tag to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 same-http origin and keep-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
-          },
           {
             "expectation": "allowed",
             "origin": "same-https",
@@ -112,6 +32,86 @@
             "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."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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-https origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 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": "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."
+          },
+          {
+            "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 blocked for picture-tag to same-http origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/script-tag.https.html

@@ -14,14 +14,34 @@
       TestCase(
         [
           {
-            "expectation": "blocked",
-            "origin": "same-http",
+            "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 allowed for script-tag 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": "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 no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and keep-scheme redirection from https context."
           },
           {
             "expectation": "blocked",
@@ -43,6 +63,16 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context."
           },
+          {
+            "expectation": "blocked",
+            "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 cross-https origin and swap-scheme redirection from https context."
+          },
           {
             "expectation": "blocked",
             "origin": "same-http",
@@ -55,13 +85,13 @@
           },
           {
             "expectation": "blocked",
-            "origin": "cross-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 cross-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": "blocked",
@@ -73,16 +103,6 @@
             "subresource_policy_deliveries": [],
             "test_description": "Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context."
           },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and keep-scheme redirection from https context."
-          },
           {
             "expectation": "blocked",
             "origin": "same-https",
@@ -92,26 +112,6 @@
             "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."
-          },
-          {
-            "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 allowed for script-tag 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": "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic.https.html

@@ -13,26 +13,6 @@
     <script>
       TestCase(
         [
-          {
-            "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 blocked for sharedworker-classic to same-http origin and no-redirect redirection from https context."
-          },
-          {
-            "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 blocked for sharedworker-classic to same-http origin and keep-scheme redirection from https context."
-          },
           {
             "expectation": "allowed",
             "origin": "same-https",
@@ -52,6 +32,26 @@
             "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."
+          },
+          {
+            "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 blocked for sharedworker-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": "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."
           }
         ],
         new SanityChecker()

tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-import-data.https.html

@@ -13,86 +13,6 @@
     <script>
       TestCase(
         [
-          {
-            "expectation": "blocked",
-            "origin": "same-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 keep-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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 cross-http origin and keep-scheme redirection from https context."
-          },
-          {
-            "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 blocked for sharedworker-import-data to same-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "cross-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 cross-http origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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-https origin and swap-scheme redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "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-http origin and swap-scheme redirection from https context."
-          },
-          {
-            "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 blocked for sharedworker-import-data to same-http origin and no-redirect redirection from https context."
-          },
-          {
-            "expectation": "blocked",
-            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
-          },
           {
             "expectation": "allowed",
             "origin": "same-https",
@@ -112,6 +32,86 @@
             "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."
+          },
+          {
+            "expectation": "blocked",
+            "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 cross-http origin and keep-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-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 cross-http origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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-http origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "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-https origin and swap-scheme redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-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 keep-scheme redirection from https context."
+          },
+          {
+            "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 blocked for sharedworker-import-data 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": "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."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-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 same-https origin and swap-scheme redirection from https context."
           }
         ],
         new SanityChecker()