Commit 718e5834 authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

[WPT/mixed-content] Tentatively rename source_scheme to source_protocol

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

The final goal is to rename all to `source_scheme` (which is done in
https://chromium-review.googlesource.com/c/chromium/src/+/1718991).
This CL renames first `source_scheme` to `source_protocol`,
just to avoid rebasing in a long chain of commits.

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

Bug: 906850
Change-Id: Ic89e60e8a5f2f2780ad416ef189cfc5d1ad1b16e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717115
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarMike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681061}
parent 8d4e9f60
...@@ -22,12 +22,12 @@ class MixedContentConfig(object): ...@@ -22,12 +22,12 @@ class MixedContentConfig(object):
self.test_file_path_pattern = self.selection_pattern + \ self.test_file_path_pattern = self.selection_pattern + \
'%(spec_name)s/' + \ '%(spec_name)s/' + \
'%(name)s.%(source_scheme)s.html' '%(name)s.%(source_protocol)s.html'
self.test_description_template = '''delivery_type: %(delivery_type)s self.test_description_template = '''delivery_type: %(delivery_type)s
delivery_value: %(delivery_value)s delivery_value: %(delivery_value)s
origin: %(origin)s origin: %(origin)s
source_scheme: %(source_scheme)s source_scheme: %(source_protocol)s
context_nesting: %(context_nesting)s context_nesting: %(context_nesting)s
redirection: %(redirection)s redirection: %(redirection)s
subresource: %(subresource)s subresource: %(subresource)s
......
...@@ -126,7 +126,7 @@ def validate(spec_json, details): ...@@ -126,7 +126,7 @@ def validate(spec_json, details):
# Validate the test_expansion schema members. # Validate the test_expansion schema members.
details['object'] = test_expansion_schema details['object'] = test_expansion_schema
assert_contains_only_fields(test_expansion_schema, [ assert_contains_only_fields(test_expansion_schema, [
'expansion', 'source_scheme', 'delivery_type', 'delivery_value', 'expansion', 'source_protocol', 'delivery_type', 'delivery_value',
'context_nesting', 'redirection', 'subresource', 'origin', 'context_nesting', 'redirection', 'subresource', 'origin',
'expectation' 'expectation'
]) ])
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
{ {
"name": "opt-in-blocks", "name": "opt-in-blocks",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
{ {
"name": "no-opt-in-allows", "name": "no-opt-in-allows",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": null, "delivery_value": null,
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
{ {
"name": "opt-in-blocks", "name": "opt-in-blocks",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
{ {
"name": "no-opt-in-blocks", "name": "no-opt-in-blocks",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": null, "delivery_value": null,
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
{ {
"name": "ws-downgrade-blocks", "name": "ws-downgrade-blocks",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
{ {
"name": "allowed", "name": "allowed",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
{ {
"name": "websocket-allowed", "name": "websocket-allowed",
"expansion": "default", "expansion": "default",
"source_scheme": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "top-level", "context_nesting": "top-level",
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
{ {
"name": "Skip-redundant-no-opt-in", "name": "Skip-redundant-no-opt-in",
"expansion": "*", "expansion": "*",
"source_scheme": "*", "source_protocol": "*",
"delivery_type": "http-rp", "delivery_type": "http-rp",
"delivery_value": null, "delivery_value": null,
"context_nesting": "*", "context_nesting": "*",
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
{ {
"name": "Redundant-subresources", "name": "Redundant-subresources",
"expansion": "*", "expansion": "*",
"source_scheme": "*", "source_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "*", "context_nesting": "*",
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
{ {
"name": "Skip-origins-not-applicable-to-websockets", "name": "Skip-origins-not-applicable-to-websockets",
"expansion": "*", "expansion": "*",
"source_scheme": "*", "source_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "*", "context_nesting": "*",
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
{ {
"name": "Skip-redundant-for-opt-in-method", "name": "Skip-redundant-for-opt-in-method",
"expansion": "*", "expansion": "*",
"source_scheme": "*", "source_protocol": "*",
"delivery_type": "meta", "delivery_type": "meta",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"context_nesting": "*", "context_nesting": "*",
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
"default", "default",
"override" "override"
], ],
"source_scheme": [ "source_protocol": [
"http", "http",
"https" "https"
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment