[WPT/common/security-features] Update subresource and redirection type names

This CL removes `redirectionTypeConversion` and
`subresourceTypeConversion`, and uses the new names directly in
`common.sub.js`.

Bug: 906850
Change-Id: I634d29ffca00180b05af38fb312c0fdeebf25776
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1788544
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Kenichi Ishibashi <bashi@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694153}

third_party/blink/web_tests/external/wpt/common/security-features/resources/common.sub.js

@@ -857,11 +857,11 @@ const subresourceMap = {
     path: "/common/security-features/subresource/audio.py",
     invoker: requestViaAudio,
   },
-  "beacon-request": {
+  "beacon": {
     path: "/common/security-features/subresource/empty.py",
     invoker: requestViaSendBeacon,
   },
-  "fetch-request": {
+  "fetch": {
     path: "/common/security-features/subresource/xhr.py",
     invoker: requestViaFetch,
   },
@@ -901,45 +901,40 @@ const subresourceMap = {
     path: "/common/security-features/subresource/video.py",
     invoker: requestViaVideo,
   },
-  "xhr-request": {
+  "xhr": {
     path: "/common/security-features/subresource/xhr.py",
     invoker: requestViaXhr,
   },
 
-  "worker-request": {
+  "worker-classic": {
     path: "/common/security-features/subresource/worker.py",
     invoker: url => requestViaDedicatedWorker(url),
   },
-  // TODO: Merge "module-worker" and "module-worker-top-level".
-  "module-worker": {
+  "worker-module": {
     path: "/common/security-features/subresource/worker.py",
     invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
   },
-  "module-worker-top-level": {
-    path: "/common/security-features/subresource/worker.py",
-    invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
-  },
-  "module-data-worker-import": {
+  "worker-import-data": {
     path: "/common/security-features/subresource/worker.py",
     invoker: url =>
         requestViaDedicatedWorker(workerUrlThatImports(url), {type: "module"}),
   },
-  "shared-worker": {
+  "sharedworker-classic": {
     path: "/common/security-features/subresource/shared-worker.py",
     invoker: requestViaSharedWorker,
   },
 
-  "websocket-request": {
+  "websocket": {
     path: "/stash_responder",
     invoker: requestViaWebSocket,
   },
 };
 for (const workletType of ['animation', 'audio', 'layout', 'paint']) {
-  subresourceMap[`worklet-${workletType}-top-level`] = {
+  subresourceMap[`worklet-${workletType}`] = {
       path: "/common/security-features/subresource/worker.py",
       invoker: url => requestViaWorklet(workletType, url)
     };
-  subresourceMap[`worklet-${workletType}-data-import`] = {
+  subresourceMap[`worklet-${workletType}-import-data`] = {
       path: "/common/security-features/subresource/worker.py",
       invoker: url =>
           requestViaWorklet(workletType, workerUrlThatImports(url))

third_party/blink/web_tests/external/wpt/common/security-features/subresource/subresource.py

@@ -71,13 +71,13 @@ def preprocess_redirection(request, response):
 
     if redirection == "no-redirect":
         return False
-    elif redirection == "keep-scheme-redirect":
+    elif redirection == "keep-scheme":
         redirect_url = create_url(request, swap_scheme=False)
-    elif redirection == "swap-scheme-redirect":
+    elif redirection == "swap-scheme":
         redirect_url = create_url(request, swap_scheme=True)
-    elif redirection == "keep-origin-redirect":
+    elif redirection == "keep-origin":
         redirect_url = create_url(request, swap_origin=False)
-    elif redirection == "swap-origin-redirect":
+    elif redirection == "swap-origin":
         redirect_url = create_url(request, swap_origin=True)
     else:
         raise ValueError("Invalid redirection type '%s'" % redirection)

third_party/blink/web_tests/external/wpt/mixed-content/generic/test-case.sub.js

@@ -18,37 +18,9 @@
 function TestCase(scenario, description, sanityChecker) {
   sanityChecker.checkScenario(scenario, subresourceMap);
 
-  const redirectionTypeConversion = {
-    "no-redirect": "no-redirect",
-    "keep-scheme": "keep-scheme-redirect",
-    "swap-scheme": "swap-scheme-redirect",
-    "keep-origin": "keep-origin-redirect",
-    "swap-origin": "swap-origin-redirect"
-  };
-  const subresourceTypeConversion = {
-    "beacon": "beacon-request",
-    "fetch": "fetch-request",
-    "xhr": "xhr-request",
-    "websocket": "websocket-request",
-    "worker-classic": "worker-request",
-    "worker-module": "module-worker",
-    "worker-import-data": "module-data-worker-import",
-    "sharedworker-classic": "shared-worker",
-    "worklet-animation": "worklet-animation-top-level",
-    "worklet-audio": "worklet-audio-top-level",
-    "worklet-layout": "worklet-layout-top-level",
-    "worklet-paint": "worklet-paint-top-level",
-    "worklet-animation-import-data": "worklet-animation-data-import",
-    "worklet-audio-import-data": "worklet-audio-data-import",
-    "worklet-layout-import-data": "worklet-layout-data-import",
-    "worklet-paint-import-data": "worklet-paint-data-import"
-  };
-  const subresourceType =
-      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
-
-  const urls = getRequestURLs(subresourceType,
+  const urls = getRequestURLs(scenario.subresource,
                               scenario.origin,
-                              redirectionTypeConversion[scenario.redirection]);
+                              scenario.redirection);
   const checkResult = _ => {
     // Send request to check if the key has been torn down.
     return xhrRequest(urls.assertUrl)
@@ -63,7 +35,7 @@ function TestCase(scenario, description, sanityChecker) {
   function runTest() {
     /** @type {Subresource} */
     const subresource = {
-      subresourceType: subresourceType,
+      subresourceType: scenario.subresource,
       url: urls.testUrl,
       policyDeliveries: scenario.subresource_policy_deliveries,
     };

third_party/blink/web_tests/external/wpt/referrer-policy/generic/test-case.sub.js

@@ -8,40 +8,13 @@ function stripUrlForUseAsReferrer(url) {
 }
 
 function invokeScenario(scenario) {
-  const redirectionTypeConversion = {
-    "no-redirect": "no-redirect",
-    "keep-scheme": "keep-scheme-redirect",
-    "swap-scheme": "swap-scheme-redirect",
-    "keep-origin": "keep-origin-redirect",
-    "swap-origin": "swap-origin-redirect"
-  };
-  const subresourceTypeConversion = {
-    "beacon": "beacon-request",
-    "fetch": "fetch-request",
-    "xhr": "xhr-request",
-    "websocket": "websocket-request",
-    "worker-classic": "worker-request",
-    "worker-module": "module-worker",
-    "worker-import-data": "module-data-worker-import",
-    "sharedworker-classic": "shared-worker",
-    "worklet-animation": "worklet-animation-top-level",
-    "worklet-audio": "worklet-audio-top-level",
-    "worklet-layout": "worklet-layout-top-level",
-    "worklet-paint": "worklet-paint-top-level",
-    "worklet-animation-import-data": "worklet-animation-data-import",
-    "worklet-audio-import-data": "worklet-audio-data-import",
-    "worklet-layout-import-data": "worklet-layout-data-import",
-    "worklet-paint-import-data": "worklet-paint-data-import"
-  };
-  const subresourceType =
-      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
   const urls = getRequestURLs(
-    subresourceType,
+    scenario.subresource,
     scenario.origin,
-    redirectionTypeConversion[scenario.redirection]);
+    scenario.redirection);
   /** @type {Subresource} */
   const subresource = {
-    subresourceType: subresourceType,
+    subresourceType: scenario.subresource,
     url: urls.testUrl,
     policyDeliveries: scenario.subresource_policy_deliveries,
   };