[WPT/referrer-policy] Rename referrer_url to expectation

To use common names in referrer-policy and
mixed-content tests.

Generated files will be updated after some more changes, not now.

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

third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/generate.py

@@ -22,7 +22,7 @@ class ReferrerPolicyConfig(object):
         self.test_file_path_pattern = '%(spec_name)s/' + self.selection_pattern + \
                                       '%(name)s.%(source_protocol)s.html'
 
-        self.test_description_template = '''The referrer URL is %(referrer_url)s when a
+        self.test_description_template = '''The referrer URL is %(expectation)s when a
 document served over %(source_protocol)s requires an %(target_protocol)s
 sub-resource via %(subresource)s using the %(delivery_method)s
 delivery method with %(redirection)s and when

third_party/blink/web_tests/external/wpt/referrer-policy/generic/tools/spec_validator.py

@@ -129,7 +129,7 @@ def validate(spec_json, details):
     details['object'] = test_expansion_schema
     assert_contains_only_fields(test_expansion_schema, [
         'expansion', 'delivery_method', 'redirection', 'origin',
-        'source_protocol', 'target_protocol', 'subresource', 'referrer_url'
+        'source_protocol', 'target_protocol', 'subresource', 'expectation'
     ])
     # Validate excluded tests.
     details['object'] = excluded_tests

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

@@ -16,7 +16,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "upgrade-protocol",
@@ -27,7 +27,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "downgrade-protocol",
@@ -38,7 +38,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         },
         {
           "name": "secure-protocol",
@@ -49,7 +49,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         }
       ]
     },
@@ -69,7 +69,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         }
       ]
     },
@@ -89,7 +89,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "upgrade-protocol",
@@ -100,7 +100,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "downgrade-protocol",
@@ -111,7 +111,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         },
         {
           "name": "secure-protocol",
@@ -122,7 +122,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         }
       ]
     },
@@ -142,7 +142,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         }
       ]
     },
@@ -162,7 +162,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "same-origin-secure-default",
@@ -173,7 +173,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "same-origin-insecure",
@@ -184,7 +184,7 @@
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         },
         {
           "name": "cross-origin",
@@ -195,7 +195,7 @@
           "redirection": "*",
           "origin": "cross-origin",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         }
       ]
     },
@@ -215,7 +215,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "same-origin-secure-default",
@@ -226,7 +226,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "same-origin-upgrade",
@@ -237,7 +237,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "same-origin-downgrade",
@@ -248,7 +248,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "same-origin-insecure",
@@ -259,7 +259,7 @@
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "cross-origin",
@@ -270,7 +270,7 @@
           "redirection": "*",
           "origin": "cross-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         }
       ]
     },
@@ -290,7 +290,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "upgrade-protocol",
@@ -301,7 +301,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "downgrade-protocol",
@@ -312,7 +312,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         },
         {
           "name": "secure-protocol",
@@ -323,7 +323,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         }
       ]
     },
@@ -343,7 +343,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "same-insecure",
@@ -354,7 +354,7 @@
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "cross-insecure",
@@ -365,7 +365,7 @@
           "redirection": "*",
           "origin": "cross-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "upgrade-protocol",
@@ -376,7 +376,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "downgrade-protocol",
@@ -387,7 +387,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "omitted"
+          "expectation": "omitted"
         },
         {
           "name": "same-secure",
@@ -398,7 +398,7 @@
           "redirection": "*",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         },
         {
           "name": "same-secure",
@@ -409,7 +409,7 @@
           "redirection": "swap-origin-redirect",
           "origin": "same-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         },
         {
           "name": "cross-secure",
@@ -420,7 +420,7 @@
           "redirection": "*",
           "origin": "cross-origin",
           "subresource": "*",
-          "referrer_url": "origin"
+          "expectation": "origin"
         }
       ]
     },
@@ -440,7 +440,7 @@
           "redirection": "*",
           "origin": "*",
           "subresource": "*",
-          "referrer_url": "stripped-referrer"
+          "expectation": "stripped-referrer"
         }
       ]
     }
@@ -462,7 +462,7 @@
         "module-worker",
         "shared-worker"
       ],
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "upgraded-protocol-workers",
@@ -477,7 +477,7 @@
         "module-worker",
         "shared-worker"
       ],
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "mixed-content-insecure-subresources",
@@ -488,7 +488,7 @@
       "redirection": "*",
       "origin": "*",
       "subresource": "*",
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "elements-not-supporting-attr-referrer",
@@ -505,7 +505,7 @@
         "shared-worker",
         "fetch-request"
       ],
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "elements-not-supporting-rel-noreferrer",
@@ -526,7 +526,7 @@
         "fetch-request",
         "area-tag"
       ],
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "area-tag",
@@ -537,7 +537,7 @@
       "redirection": "*",
       "origin": "*",
       "subresource": "area-tag",
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "worker-requests-with-swap-origin-redirect",
@@ -552,7 +552,7 @@
         "module-worker",
         "shared-worker"
       ],
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "overhead-for-redirection",
@@ -563,7 +563,7 @@
       "redirection": ["keep-origin-redirect", "swap-origin-redirect"],
       "origin": "*",
       "subresource": ["a-tag", "area-tag"],
-      "referrer_url": "*"
+      "expectation": "*"
     },
     {
       "name": "source-https-unsupported-by-web-platform-tests-runners",
@@ -574,7 +574,7 @@
       "redirection": "*",
       "origin": "*",
       "subresource": "*",
-      "referrer_url": "*"
+      "expectation": "*"
     }
   ],
 
@@ -637,7 +637,7 @@
       "fetch-request"
     ],
 
-    "referrer_url": [
+    "expectation": [
       "omitted",
       "origin",
       "stripped-referrer"