[WPT/common/security-features] Update origin and redirection values

Generated files will be updated after some more changes, not now.
Also, changes needed in JavaScripts to handle new generated values
are not included in this CL and will land later.

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

third_party/blink/web_tests/external/wpt/mixed-content/spec.src.json

@@ -18,8 +18,8 @@
             "optionally-blockable": "*"
           },
           "origin": [
-            "cross-origin-http",
-            "same-host-http"
+            "cross-http",
+            "same-http"
           ],
           "expectation": "blocked"
         },
@@ -35,8 +35,8 @@
             "optionally-blockable": "*"
           },
           "origin": [
-            "cross-origin-http",
-            "same-host-http"
+            "cross-http",
+            "same-http"
           ],
           "expectation": "allowed"
         }
@@ -60,8 +60,8 @@
             "optionally-blockable": []
           },
           "origin": [
-            "cross-origin-http",
-            "same-host-http"
+            "cross-http",
+            "same-http"
           ],
           "expectation": "blocked"
         },
@@ -77,8 +77,8 @@
             "optionally-blockable": []
           },
           "origin": [
-            "cross-origin-http",
-            "same-host-http"
+            "cross-http",
+            "same-http"
           ],
           "expectation": "blocked"
         },
@@ -94,8 +94,8 @@
             "optionally-blockable": []
           },
           "origin": [
-            "cross-origin-ws",
-            "same-host-ws"
+            "cross-ws",
+            "same-ws"
           ],
           "expectation": "blocked"
         }
@@ -115,14 +115,14 @@
           "delivery_value": "*",
           "redirection": [
             "no-redirect",
-            "keep-scheme-redirect"
+            "keep-scheme"
           ],
           "subresource": {
             "blockable": "*",
             "optionally-blockable": "*"
           },
           "origin": [
-            "same-host-https"
+            "same-https"
           ],
           "expectation": "allowed"
         },
@@ -134,14 +134,14 @@
           "delivery_value": "*",
           "redirection": [
             "no-redirect",
-            "keep-scheme-redirect"
+            "keep-scheme"
           ],
           "subresource": {
             "blockable": "websocket-request",
             "optionally-blockable": []
           },
           "origin": [
-            "same-host-wss"
+            "same-wss"
           ],
           "expectation": "allowed"
         }
@@ -194,10 +194,10 @@
         "optionally-blockable": []
       },
       "origin": [
-        "same-host-https",
-        "same-host-http",
-        "cross-origin-https",
-        "cross-origin-http"
+        "same-https",
+        "same-http",
+        "cross-https",
+        "cross-http"
       ],
       "expectation": "*"
     },
@@ -208,8 +208,8 @@
       "delivery_type": "meta",
       "delivery_value": "opt-in",
       "redirection": [
-        "keep-scheme-redirect",
-        "swap-scheme-redirect"
+        "keep-scheme",
+        "swap-scheme"
       ],
       "subresource": {
         "blockable": "*",
@@ -238,18 +238,18 @@
     ],
     "redirection": [
       "no-redirect",
-      "keep-scheme-redirect",
-      "swap-scheme-redirect"
+      "keep-scheme",
+      "swap-scheme"
     ],
     "origin": [
-      "same-host-https",
-      "same-host-http",
-      "cross-origin-https",
-      "cross-origin-http",
-      "same-host-wss",
-      "same-host-ws",
-      "cross-origin-wss",
-      "cross-origin-ws"
+      "same-https",
+      "same-http",
+      "cross-https",
+      "cross-http",
+      "same-wss",
+      "same-ws",
+      "cross-wss",
+      "cross-ws"
     ],
     "subresource": {
       "blockable": [

third_party/blink/web_tests/external/wpt/referrer-policy/spec.src.json

@@ -252,7 +252,7 @@
             "attr-referrer"
           ],
           "delivery_value": "same-origin",
-          "redirection": "swap-origin-redirect",
+          "redirection": "swap-origin",
           "origin": [
             "same-http",
             "same-https"
@@ -356,7 +356,7 @@
             "attr-referrer"
           ],
           "delivery_value": "origin-when-cross-origin",
-          "redirection": "swap-origin-redirect",
+          "redirection": "swap-origin",
           "origin": [
             "same-http",
             "same-https"
@@ -495,7 +495,7 @@
             "attr-referrer"
           ],
           "delivery_value": "strict-origin-when-cross-origin",
-          "redirection": "swap-origin-redirect",
+          "redirection": "swap-origin",
           "origin": "same-http",
           "subresource": "*",
           "expectation": "origin"
@@ -576,7 +576,7 @@
             "attr-referrer"
           ],
           "delivery_value": "strict-origin-when-cross-origin",
-          "redirection": "swap-origin-redirect",
+          "redirection": "swap-origin",
           "origin": "same-https",
           "subresource": "*",
           "expectation": "origin"
@@ -733,7 +733,7 @@
       "source_protocol": "*",
       "delivery_type": "*",
       "delivery_value": "*",
-      "redirection": "swap-origin-redirect",
+      "redirection": "swap-origin",
       "origin": "*",
       "subresource": [
         "worker-request",
@@ -749,8 +749,8 @@
       "delivery_type": "*",
       "delivery_value": "*",
       "redirection": [
-        "keep-origin-redirect",
-        "swap-origin-redirect"
+        "keep-origin",
+        "swap-origin"
       ],
       "origin": "*",
       "subresource": [
@@ -805,8 +805,8 @@
     ],
     "redirection": [
       "no-redirect",
-      "keep-origin-redirect",
-      "swap-origin-redirect"
+      "keep-origin",
+      "swap-origin"
     ],
     "subresource": [
       "iframe-tag",