Consolidate header files for client hint WPTs
Move files with the same "Accept-CH" header to their own directory,
remove "Accept-CH" line from header file, and add "__dir__.headers" file
This will make it easier to update header files for added hints in later
CLs
No values were changed, only moved
Bug: 1304740
Change-Id: I065eb85ab8f10a79161366fa491b1f30a22a097e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3542073
Reviewed-by: Ali Beyad <abeyad@chromium.org>
Commit-Queue: Victor Tan <victortan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#992261}
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-answers.sub.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-answers.sub.https.html.headers
deleted file mode 100644
index 53fe8f5..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-answers.sub.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-cache-revalidation.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-cache-revalidation.https.html.headers
deleted file mode 100644
index 25df036..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-cache-revalidation.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-dpr,dpr,sec-ch-device-memory,device-memory,sec-ch-viewport-width,viewport-width,rtt,downlink,ect,sec-ch-ua,sec-ch-ua-arch,sec-ch-ua-platform,sec-ch-ua-platform-version,sec-ch-ua-model,sec-ch-prefers-color-scheme,sec-ch-viewport-height
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy-navigation.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy-navigation.https.html.headers
deleted file mode 100644
index f8ba989..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy-navigation.https.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Accept-CH: Sec-CH-Device-Memory, Device-Memory, Sec-CH-DPR, DPR, Sec-CH-Viewport-Width, Viewport-Width
-Feature-Policy: ch-device-memory *; ch-dpr 'none'; ch-viewport-width 'self'; ch-ua 'self'; ch-ua-mobile 'none'; ch-prefers-color-scheme 'none'
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy.sub.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy.sub.https.html.headers
deleted file mode 100644
index e3a9458..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy.sub.https.html.headers
+++ /dev/null
@@ -1,2 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect, mobile, sec-ch-prefers-color-scheme, sec-ch-viewport-height
-Feature-Policy: ch-device-memory *; ch-dpr 'none'; ch-viewport-width 'self'; ch-mobile; ch-prefers-color-scheme 'none'; ch-viewport-height 'none'
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-non-secure.http.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-non-secure.http.html.headers
deleted file mode 100644
index 53fe8f5..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-non-secure.http.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/__dir__.headers
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe.https.html.headers
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/__dir__.headers
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-answers.sub.https.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/answers.sub.https.html
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-answers.sub.https.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/answers.sub.https.html
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-cache-revalidation.https.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/cache-revalidation.https.html
similarity index 79%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-cache-revalidation.https.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/cache-revalidation.https.html
index cc8453d..ad94e7b 100644
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-cache-revalidation.https.html
+++ b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/cache-revalidation.https.html
@@ -37,13 +37,13 @@
"sec-ch-viewport-height",
];
- const response = await fetch(`resources/stale-echo-client-hints.py?token=` + request_token);
- const response2 = await fetch(`resources/stale-echo-client-hints.py?token=` + request_token);
+ const response = await fetch(`/client-hints/resources/stale-echo-client-hints.py?token=` + request_token);
+ const response2 = await fetch(`/client-hints/resources/stale-echo-client-hints.py?token=` + request_token);
assert_equals(response.headers.get('Unique-Id'), response2.headers.get('Unique-Id'));
while(true) {
- const revalidation_check = await fetch(`resources/stale-echo-client-hints.py?query&token=` + request_token);
+ const revalidation_check = await fetch(`/client-hints/resources/stale-echo-client-hints.py?query&token=` + request_token);
if (revalidation_check.headers.get('Count') == '2') {
client_hint_headers.forEach(header => {
assert_equals(revalidation_check.headers.get(header+"-recieved"), revalidation_check.headers.get(header+"-previous"));
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/__dir__.headers
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https.html.headers
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/__dir__.headers
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy-navigation.https.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html
similarity index 93%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy-navigation.https.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html
index 4a9c0c8..240ee70 100644
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy-navigation.https.html
+++ b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html
@@ -3,7 +3,7 @@
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/common/get-host-info.sub.js"></script>
-<script src="resources/feature-policy-navigation.js"></script>
+<script src="/client-hints/resources/feature-policy-navigation.js"></script>
<script>
(async () => {
await test_frame(
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers
new file mode 100644
index 0000000..7e83285
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https.html.headers
@@ -0,0 +1 @@
+Feature-Policy: ch-device-memory *; ch-dpr 'none'; ch-viewport-width 'self'; ch-ua 'self'; ch-ua-mobile 'none'; ch-prefers-color-scheme 'none'
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html
similarity index 94%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html
index 42791a3b..2acf5f1 100644
--- a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https.html
+++ b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https.html
@@ -3,7 +3,7 @@
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/common/get-host-info.sub.js"></script>
-<script src="resources/feature-policy-navigation.js"></script>
+<script src="/client-hints/resources/feature-policy-navigation.js"></script>
<script>
(async () => {
await test_frame(
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy.sub.https.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy.sub.https.html
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-feature-policy.sub.https.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy.sub.https.html
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy.sub.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy.sub.https.html.headers
new file mode 100644
index 0000000..b3f6399
--- /dev/null
+++ b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/feature-policy.sub.https.html.headers
@@ -0,0 +1 @@
+Feature-Policy: ch-device-memory *; ch-dpr 'none'; ch-viewport-width 'self'; ch-mobile; ch-prefers-color-scheme 'none'; ch-viewport-height 'none'
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy.sub.https.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/no-feature-policy.sub.https.html
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy.sub.https.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/no-feature-policy.sub.https.html
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-non-secure.http.html b/third_party/blink/web_tests/external/wpt/client-hints/accept-ch/non-secure.http.html
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-non-secure.http.html
rename to third_party/blink/web_tests/external/wpt/client-hints/accept-ch/non-secure.http.html
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy.sub.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/__dir__.headers
similarity index 100%
rename from third_party/blink/web_tests/external/wpt/client-hints/accept-ch-no-feature-policy.sub.https.html.headers
rename to third_party/blink/web_tests/external/wpt/client-hints/sandbox/__dir__.headers
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp-same-origin.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp-same-origin.https.html.headers
index cf57761d..895eb51 100644
--- a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp-same-origin.https.html.headers
+++ b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp-same-origin.https.html.headers
@@ -1,2 +1 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
Content-Security-Policy: sandbox allow-scripts allow-same-origin
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp.https.html.headers
index e0deb77..c7e4e7c 100644
--- a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp.https.html.headers
+++ b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-csp.https.html.headers
@@ -1,2 +1 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
Content-Security-Policy: sandbox allow-scripts
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-iframe-popups.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-iframe-popups.https.html.headers
deleted file mode 100644
index 53fe8f5..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-iframe-popups.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-popups-escape-sandbox.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-popups-escape-sandbox.https.html.headers
deleted file mode 100644
index 53fe8f5..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-popups-escape-sandbox.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-popups.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-popups.https.html.headers
deleted file mode 100644
index 53fe8f5..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-popups.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-same-origin.https.html.headers b/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-same-origin.https.html.headers
deleted file mode 100644
index 53fe8f5..0000000
--- a/third_party/blink/web_tests/external/wpt/client-hints/sandbox/iframe-same-origin.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Accept-CH: sec-ch-device-memory, device-memory, sec-ch-dpr, dpr, sec-ch-viewport-width, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch-feature-policy-navigation.https-expected.txt b/third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch-feature-policy-navigation.https-expected.txt
rename to third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch/feature-policy-navigation/feature-policy.https-expected.txt
diff --git a/third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https-expected.txt b/third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch-no-feature-policy-navigation.https-expected.txt
rename to third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch/feature-policy-navigation/no-feature-policy.https-expected.txt
diff --git a/third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch-feature-policy.sub.https-expected.txt b/third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch/feature-policy.sub.https-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch-feature-policy.sub.https-expected.txt
rename to third_party/blink/web_tests/virtual/disable-ua-client-hint/external/wpt/client-hints/accept-ch/feature-policy.sub.https-expected.txt
diff --git a/third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch-answers.sub.https-expected.txt b/third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch/answers.sub.https-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch-answers.sub.https-expected.txt
rename to third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch/answers.sub.https-expected.txt
diff --git a/third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch-feature-policy.sub.https-expected.txt b/third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch/feature-policy.sub.https-expected.txt
similarity index 100%
rename from third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch-feature-policy.sub.https-expected.txt
rename to third_party/blink/web_tests/virtual/legacy-client-hints/external/wpt/client-hints/accept-ch/feature-policy.sub.https-expected.txt