From bd040f26988de274b572e49a1139b138c448d899 Mon Sep 17 00:00:00 2001
From: Blink WPT Bot <blink-w3c-test-autoroller@chromium.org>
Date: Wed, 18 Mar 2020 05:04:17 -0700
Subject: [PATCH] UpgradeInsecureRequest: Add subresource fetch from data: URL
 workers test (#22235)

This CL adds WPTs to test subresource fetch from data: URL dedicated and
shared workers with upgrade-insecure-request CSP.

The manual change is only in upgrade-insecure-requests/spec.src.json.
Others are automatically generated by generate.py.

Bug: 989399
Change-Id: Iefb7764be8ce68b5aefb1ac83f253302050fe55e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2102088
Commit-Queue: Eriko Kurimoto <elkurin@google.com>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Hiroshige Hayashizaki <hiroshige@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751234}

Co-authored-by: Eriko Kurimoto <elkurin@google.com>
---
 .../upgrade/fetch.https.html                  | 112 +++++++++++++++++
 .../upgrade/fetch.https.html.headers          |   1 +
 .../upgrade/websocket.https.html              |  52 ++++++++
 .../upgrade/websocket.https.html.headers      |   1 +
 .../upgrade/xhr.https.html                    | 112 +++++++++++++++++
 .../upgrade/xhr.https.html.headers            |   1 +
 .../unset/fetch.https.html                    | 112 +++++++++++++++++
 .../unset/websocket.https.html                |  52 ++++++++
 .../unset/xhr.https.html                      | 112 +++++++++++++++++
 .../upgrade/fetch.https.html                  | 113 ++++++++++++++++++
 .../upgrade/websocket.https.html              |  53 ++++++++
 .../upgrade/xhr.https.html                    | 113 ++++++++++++++++++
 .../upgrade/fetch.https.html                  | 112 +++++++++++++++++
 .../upgrade/fetch.https.html.headers          |   1 +
 .../upgrade/websocket.https.html              |  52 ++++++++
 .../upgrade/websocket.https.html.headers      |   1 +
 .../upgrade/xhr.https.html                    | 112 +++++++++++++++++
 .../upgrade/xhr.https.html.headers            |   1 +
 .../unset/fetch.https.html                    | 112 +++++++++++++++++
 .../unset/websocket.https.html                |  52 ++++++++
 .../unset/xhr.https.html                      | 112 +++++++++++++++++
 .../upgrade/fetch.https.html                  | 113 ++++++++++++++++++
 .../upgrade/websocket.https.html              |  53 ++++++++
 .../upgrade/xhr.https.html                    | 113 ++++++++++++++++++
 .../upgrade/fetch.https.html                  | 112 +++++++++++++++++
 .../upgrade/fetch.https.html.headers          |   1 +
 .../upgrade/websocket.https.html              |  52 ++++++++
 .../upgrade/websocket.https.html.headers      |   1 +
 .../upgrade/xhr.https.html                    | 112 +++++++++++++++++
 .../upgrade/xhr.https.html.headers            |   1 +
 .../unset/fetch.https.html                    | 112 +++++++++++++++++
 .../unset/websocket.https.html                |  52 ++++++++
 .../unset/xhr.https.html                      | 112 +++++++++++++++++
 .../upgrade/fetch.https.html                  | 113 ++++++++++++++++++
 .../upgrade/websocket.https.html              |  53 ++++++++
 .../upgrade/xhr.https.html                    | 113 ++++++++++++++++++
 upgrade-insecure-requests/spec.src.json       |   5 +-
 37 files changed, 2503 insertions(+), 4 deletions(-)
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html
 create mode 100644 upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html

diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html
new file mode 100644
index 00000000000000..b65bb8451f0f18
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/fetch.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html
new file mode 100644
index 00000000000000..f1933b620e9b60
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/websocket.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html
new file mode 100644
index 00000000000000..026d771dd7f2ee
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.http-rp/upgrade/xhr.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html
new file mode 100644
index 00000000000000..95c36dab703411
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/fetch.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html
new file mode 100644
index 00000000000000..116967e0207408
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/websocket.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html
new file mode 100644
index 00000000000000..89ab0fe4ef9f8f
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/unset/xhr.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html
new file mode 100644
index 00000000000000..eea46ce9648d52
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/fetch.https.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html
new file mode 100644
index 00000000000000..4347f0118885cf
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/websocket.https.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html
new file mode 100644
index 00000000000000..c0447cf3c021d6
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-classic-data.meta/upgrade/xhr.https.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-classic-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html
new file mode 100644
index 00000000000000..ea2320e6ce728e
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/fetch.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html
new file mode 100644
index 00000000000000..124a03c37f4cc2
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/websocket.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html
new file mode 100644
index 00000000000000..b04b07adb5740f
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.http-rp/upgrade/xhr.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html
new file mode 100644
index 00000000000000..d6b8cdf41712c1
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/fetch.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html
new file mode 100644
index 00000000000000..a4798e53a062c2
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/websocket.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html
new file mode 100644
index 00000000000000..681c1cee442f6f
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/unset/xhr.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html
new file mode 100644
index 00000000000000..b355fd0c14c276
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/fetch.https.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html
new file mode 100644
index 00000000000000..36bac646a02d69
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/websocket.https.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html
new file mode 100644
index 00000000000000..befbb210fc88f7
--- /dev/null
+++ b/upgrade-insecure-requests/gen/sharedworker-module-data.meta/upgrade/xhr.https.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "sharedworker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html
new file mode 100644
index 00000000000000..a3fa13ecfd9cd9
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/fetch.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html
new file mode 100644
index 00000000000000..53dc448d6c497c
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/websocket.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html
new file mode 100644
index 00000000000000..1125fa454346c5
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers
new file mode 100644
index 00000000000000..602d9dc38d0a59
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.http-rp/upgrade/xhr.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: upgrade-insecure-requests
diff --git a/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html b/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html
new file mode 100644
index 00000000000000..a3cd2146663d34
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.meta/unset/fetch.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html b/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html
new file mode 100644
index 00000000000000..27e0c78bb8e20d
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.meta/unset/websocket.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html b/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html
new file mode 100644
index 00000000000000..cc450bfef7a0e5
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.meta/unset/xhr.https.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "blocked",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects blocked for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html b/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html
new file mode 100644
index 00000000000000..b50873f80858af
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/fetch.https.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "fetch",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for fetch to same-http-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html b/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html
new file mode 100644
index 00000000000000..0173f7986b0347
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/websocket.https.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "cross-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to cross-ws-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-ws-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "websocket",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for websocket to same-ws-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html b/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html
new file mode 100644
index 00000000000000..cc0a17b9f1acd9
--- /dev/null
+++ b/upgrade-insecure-requests/gen/worker-module-data.meta/upgrade/xhr.https.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec upgrade-insecure-requests/` -->
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="../../../generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        [
+          {
+            "expectation": "allowed",
+            "origin": "same-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and no-redirect redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-https",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-https origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "same-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to same-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "downgrade",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and downgrade redirection from https context."
+          },
+          {
+            "expectation": "allowed",
+            "origin": "cross-http-downgrade",
+            "redirection": "no-redirect",
+            "source_context_list": [
+              {
+                "policyDeliveries": [],
+                "sourceContextType": "worker-module-data"
+              }
+            ],
+            "source_scheme": "https",
+            "subresource": "xhr",
+            "subresource_policy_deliveries": [],
+            "test_description": "Upgrade-Insecure-Requests: Expects allowed for xhr to cross-http-downgrade origin and no-redirect redirection from https context."
+          }
+        ],
+        new SanityChecker()
+      ).start();
+    </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/upgrade-insecure-requests/spec.src.json b/upgrade-insecure-requests/spec.src.json
index 139b5c451f7438..43f2d6dbc1867c 100644
--- a/upgrade-insecure-requests/spec.src.json
+++ b/upgrade-insecure-requests/spec.src.json
@@ -102,10 +102,7 @@
       "source_context_list": [
         "req",
         "srcdoc",
-        "iframe",
-        "worker-module-data",
-        "sharedworker-classic-data",
-        "sharedworker-module-data"
+        "iframe"
       ],
       "delivery_type": "*",
       "delivery_value": "*",