Update web-platform-tests to revision 0d4300c5045a5587c2eb3d1416b11ffeecf5dadc

2 files changed, 17 insertions, 2 deletions

diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py
index 1b0c2897fee..ee272036997 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/generate.py
@@ -40,11 +40,19 @@ for name, resourceType in [
   ('worker', 'WORKER'),
   ('module-worker', 'WORKER'),
   ('worker-subresource-xhr', 'FETCH'),
-  ('worker-subresource-fetch', 'FETCH')]:
-  sameOriginOnly = 'true' if resourceType == 'WORKER' else 'false'
+  ('worker-subresource-fetch', 'FETCH'),
+  ('shared-worker', 'SHARED_WORKER')]:
+  # TODO(https://crbug.com/989399): Add tests for subresource requests on shared
+  # workers, and main/subresource requests on service workers.
+
+  sameOriginOnly = 'false'
+  if resourceType == 'WORKER' or resourceType == 'SHARED_WORKER':
+    sameOriginOnly = 'true'
+
   types = [('', 'generateTests'), ('-redirect', 'generateRedirectTests')]
   if name == 'module-worker' or resourceType == 'WORKLET':
     types.append(('-import', 'generateModuleImportTests'))
+
   for typeName, generatorName in types:
     filename = '%s%s-upgrade.https.html' % (name, typeName)
     with open(filename, 'w') as html_file:
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js
index f578e8987a1..da20d2644b3 100644
--- a/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/support/testharness-helper.sub.js
@@ -12,6 +12,7 @@ const ResourceType = {
   IMAGE: "image",
   FRAME: "frame",
   WORKER: "worker",
+  SHARED_WORKER: "shared-worker",
   WORKLET: "worklet",
   WEBSOCKET: "websocket",
   FETCH: "fetch",
@@ -36,6 +37,8 @@ function generateURL(host, protocol, resourceType) {
     url.pathname = "echo";
   } else if (resourceType == ResourceType.WORKER) {
     url.pathname += "worker.py";
+  } else if (resourceType == ResourceType.SHARED_WORKER) {
+    url.pathname += "shared-worker.py";
   } else if (resourceType == ResourceType.WORKLET) {
     url.pathname += "worker.py";
   } else if (resourceType == ResourceType.FETCH) {
@@ -184,6 +187,10 @@ const testMap = {
                                         {}),
         test.name),
 
+  "shared-worker":
+    test => promise_test(
+        () => requestViaSharedWorker(test.url), test.name),
+
   "audio-worklet":
     test => promise_test(
         () => requestViaWorklet('audio', test.url), test.name),