Commit 7b585a5d authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

[WPT/mixed-content] Remove context_nesting

The values are always `top-level` and not used anywhere.

Bug: 906850
Change-Id: Ia89f9b65cac935d65287a702f61f292513ca6189
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717487
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarKenichi Ishibashi <bashi@chromium.org>
Reviewed-by: default avatarMike West <mkwst@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681068}
parent bfeb9d10
...@@ -17,7 +17,7 @@ class MixedContentConfig(object): ...@@ -17,7 +17,7 @@ class MixedContentConfig(object):
'%(delivery_type)s/' + \ '%(delivery_type)s/' + \
'%(delivery_value)s/' + \ '%(delivery_value)s/' + \
'%(origin)s/' + \ '%(origin)s/' + \
'%(context_nesting)s/' + \ 'top-level/' + \
'%(redirection)s/' '%(redirection)s/'
self.test_file_path_pattern = self.selection_pattern + \ self.test_file_path_pattern = self.selection_pattern + \
...@@ -28,7 +28,7 @@ class MixedContentConfig(object): ...@@ -28,7 +28,7 @@ class MixedContentConfig(object):
delivery_value: %(delivery_value)s delivery_value: %(delivery_value)s
origin: %(origin)s origin: %(origin)s
source_scheme: %(source_protocol)s source_scheme: %(source_protocol)s
context_nesting: %(context_nesting)s context_nesting: top-level
redirection: %(redirection)s redirection: %(redirection)s
subresource: %(subresource)s subresource: %(subresource)s
expectation: %(expectation)s expectation: %(expectation)s
......
...@@ -127,8 +127,7 @@ def validate(spec_json, details): ...@@ -127,8 +127,7 @@ def validate(spec_json, details):
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_protocol', 'delivery_type', 'delivery_value', 'expansion', 'source_protocol', 'delivery_type', 'delivery_value',
'context_nesting', 'redirection', 'subresource', 'origin', 'redirection', 'subresource', 'origin', 'expectation'
'expectation'
]) ])
# Validate excluded tests. # Validate excluded tests.
details['object'] = excluded_tests details['object'] = excluded_tests
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"context_nesting": "top-level",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": [], "blockable": [],
...@@ -27,7 +26,6 @@ ...@@ -27,7 +26,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": null, "delivery_value": null,
"context_nesting": "top-level",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": [], "blockable": [],
...@@ -50,7 +48,6 @@ ...@@ -50,7 +48,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"context_nesting": "top-level",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": "*", "blockable": "*",
...@@ -65,7 +62,6 @@ ...@@ -65,7 +62,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": null, "delivery_value": null,
"context_nesting": "top-level",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": "*", "blockable": "*",
...@@ -80,7 +76,6 @@ ...@@ -80,7 +76,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "top-level",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": "websocket-request", "blockable": "websocket-request",
...@@ -103,7 +98,6 @@ ...@@ -103,7 +98,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "top-level",
"redirection": ["no-redirect", "keep-scheme-redirect"], "redirection": ["no-redirect", "keep-scheme-redirect"],
"subresource": { "subresource": {
"blockable": "*", "blockable": "*",
...@@ -118,7 +112,6 @@ ...@@ -118,7 +112,6 @@
"source_protocol": "https", "source_protocol": "https",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "top-level",
"redirection": ["no-redirect", "keep-scheme-redirect"], "redirection": ["no-redirect", "keep-scheme-redirect"],
"subresource": { "subresource": {
"blockable": "websocket-request", "blockable": "websocket-request",
...@@ -140,7 +133,6 @@ ...@@ -140,7 +133,6 @@
"source_protocol": "*", "source_protocol": "*",
"delivery_type": "http-rp", "delivery_type": "http-rp",
"delivery_value": null, "delivery_value": null,
"context_nesting": "*",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": "*", "blockable": "*",
...@@ -155,7 +147,6 @@ ...@@ -155,7 +147,6 @@
"source_protocol": "*", "source_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "*",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": [ "blockable": [
...@@ -172,7 +163,6 @@ ...@@ -172,7 +163,6 @@
"source_protocol": "*", "source_protocol": "*",
"delivery_type": "*", "delivery_type": "*",
"delivery_value": "*", "delivery_value": "*",
"context_nesting": "*",
"redirection": "*", "redirection": "*",
"subresource": { "subresource": {
"blockable": [ "blockable": [
...@@ -194,7 +184,6 @@ ...@@ -194,7 +184,6 @@
"source_protocol": "*", "source_protocol": "*",
"delivery_type": "meta", "delivery_type": "meta",
"delivery_value": "opt-in", "delivery_value": "opt-in",
"context_nesting": "*",
"redirection": ["keep-scheme-redirect", "swap-scheme-redirect"], "redirection": ["keep-scheme-redirect", "swap-scheme-redirect"],
"subresource": { "subresource": {
"blockable": "*", "blockable": "*",
...@@ -227,10 +216,6 @@ ...@@ -227,10 +216,6 @@
"keep-scheme-redirect", "keep-scheme-redirect",
"swap-scheme-redirect" "swap-scheme-redirect"
], ],
"context_nesting": [
"top-level",
"sub-level"
],
"origin": [ "origin": [
"same-host-https", "same-host-https",
"same-host-http", "same-host-http",
......
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