From 228ee6ee6050a1f60882f247ca4725a2b694b166 Mon Sep 17 00:00:00 2001
From: Arthur Sonzogni <arthursonzogni@chromium.org>
Date: Wed, 5 May 2021 07:06:11 -0700
Subject: [PATCH] Rename COEP:{cors-or-credentialless => credentialless}

This was discussed here:
https://github.com/whatwg/html/issues/6637#issuecomment-831113698

This patch renames "cors-or-credentialless" into "credentialless".

The WPT test directory:
- html/cross-origin-embedder-policy/credentialless/cors-or-credentialess/
- html/cross-origin-embedder-policy/credentialless/full-credentialless/
are renamed:
- html/cross-origin-embedder-policy/cors-or-credentialess/
- html/cross-origin-embedder-policy/anonymous-iframe/

Bug:1175099
Change-Id: Iba052a2b3fbf4b45607c48807622d5ced202d583
---
 .../cookie.tentative.https.html                 |  4 ++--
 .../local-storage.tentative.https.html          |  4 ++--
 .../resources/common.js                         |  0
 .../cross-origin-isolated.html                  |  4 ++--
 .../dedicated-worker.tentative.https.html       |  5 ++---
 .../fetch.tentative.https.html                  |  4 ++--
 ...ame-coep-credentialless.tentative.https.html |  4 ++--
 .../iframe-coep-none.tentative.https.html       |  4 ++--
 ...frame-coep-require-corp.tentative.https.html |  4 ++--
 .../iframe.tentative.html                       |  8 ++++----
 .../image.tentative.https.html                  |  4 ++--
 .../link.tentative.https.html                   |  4 ++--
 .../redirect.tentative.html                     |  6 +++---
 .../credentialless/resources/common.js          |  4 ++--
 .../resources/iframeTest.js                     |  0
 .../script.tentative.https.html                 |  4 ++--
 .../service-worker.tentative.https.html         |  5 ++---
 .../shared-worker.tentative.https.html          | 17 ++++++++---------
 .../video.tentative.https.html                  |  4 ++--
 19 files changed, 43 insertions(+), 46 deletions(-)
 rename html/cross-origin-embedder-policy/{credentialless/full-credentialless => anonymous-iframe}/cookie.tentative.https.html (94%)
 rename html/cross-origin-embedder-policy/{credentialless/full-credentialless => anonymous-iframe}/local-storage.tentative.https.html (93%)
 rename html/cross-origin-embedder-policy/{credentialless/full-credentialless => anonymous-iframe}/resources/common.js (100%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/cross-origin-isolated.html (94%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/dedicated-worker.tentative.https.html (96%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/fetch.tentative.https.html (97%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/iframe-coep-credentialless.tentative.https.html (95%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/iframe-coep-none.tentative.https.html (91%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/iframe-coep-require-corp.tentative.https.html (95%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/iframe.tentative.html (86%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/image.tentative.https.html (97%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/link.tentative.https.html (97%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/redirect.tentative.html (92%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/resources/iframeTest.js (100%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/script.tentative.https.html (97%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/service-worker.tentative.https.html (96%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/shared-worker.tentative.https.html (85%)
 rename html/cross-origin-embedder-policy/credentialless/{cors-or-credentialless => }/video.tentative.https.html (97%)

diff --git a/html/cross-origin-embedder-policy/credentialless/full-credentialless/cookie.tentative.https.html b/html/cross-origin-embedder-policy/anonymous-iframe/cookie.tentative.https.html
similarity index 94%
rename from html/cross-origin-embedder-policy/credentialless/full-credentialless/cookie.tentative.https.html
rename to html/cross-origin-embedder-policy/anonymous-iframe/cookie.tentative.https.html
index aa2a3838d7defd..16f7abbbe31821 100644
--- a/html/cross-origin-embedder-policy/credentialless/full-credentialless/cookie.tentative.https.html
+++ b/html/cross-origin-embedder-policy/anonymous-iframe/cookie.tentative.https.html
@@ -2,9 +2,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
+<script src="../credentialless/resources/common.js"></script>
+<script src="../credentialless/resources/dispatcher.js"></script>
 <script src="./resources/common.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
 <script>
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
diff --git a/html/cross-origin-embedder-policy/credentialless/full-credentialless/local-storage.tentative.https.html b/html/cross-origin-embedder-policy/anonymous-iframe/local-storage.tentative.https.html
similarity index 93%
rename from html/cross-origin-embedder-policy/credentialless/full-credentialless/local-storage.tentative.https.html
rename to html/cross-origin-embedder-policy/anonymous-iframe/local-storage.tentative.https.html
index 28b7c78d3484dd..a49eac706bea98 100644
--- a/html/cross-origin-embedder-policy/credentialless/full-credentialless/local-storage.tentative.https.html
+++ b/html/cross-origin-embedder-policy/anonymous-iframe/local-storage.tentative.https.html
@@ -2,9 +2,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
+<script src="../credentialless/resources/common.js"></script>
+<script src="../credentialless/resources/dispatcher.js"></script>
 <script src="./resources/common.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
 <script>
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
diff --git a/html/cross-origin-embedder-policy/credentialless/full-credentialless/resources/common.js b/html/cross-origin-embedder-policy/anonymous-iframe/resources/common.js
similarity index 100%
rename from html/cross-origin-embedder-policy/credentialless/full-credentialless/resources/common.js
rename to html/cross-origin-embedder-policy/anonymous-iframe/resources/common.js
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/cross-origin-isolated.html b/html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.html
similarity index 94%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/cross-origin-isolated.html
rename to html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.html
index 37f07581314b28..86d30cdb458ff3 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/cross-origin-isolated.html
+++ b/html/cross-origin-embedder-policy/credentialless/cross-origin-isolated.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script>
 
 const http  = get_host_info().HTTP_ORIGIN;
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/dedicated-worker.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/dedicated-worker.tentative.https.html
similarity index 96%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/dedicated-worker.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/dedicated-worker.tentative.https.html
index e02620ee217944..33e6e179b49978 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/dedicated-worker.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/dedicated-worker.tentative.https.html
@@ -1,12 +1,11 @@
 <!doctype html>
-<title>CORS or Credentialless and dedicated worker</title>
 <meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script>
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/fetch.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/fetch.tentative.https.html
similarity index 97%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/fetch.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/fetch.tentative.https.html
index befad16a45ee59..b6c84a8ef9e986 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/fetch.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/fetch.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script>
 
 promise_test(async test => {
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-credentialless.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.tentative.https.html
similarity index 95%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-credentialless.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.tentative.https.html
index 606093cedf6d61..85d2be9a23fc4a 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-credentialless.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/iframe-coep-credentialless.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script src="./resources/iframeTest.js"></script>
 
 <script>
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-none.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.tentative.https.html
similarity index 91%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-none.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/iframe-coep-none.tentative.https.html
index 570454ef757109..ad28c3a59172b2 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-none.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/iframe-coep-none.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script src="./resources/iframeTest.js"></script>
 
 <script>
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-require-corp.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.tentative.https.html
similarity index 95%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-require-corp.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.tentative.https.html
index 08f96422b96592..622676df7cf376 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe-coep-require-corp.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/iframe-coep-require-corp.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script src="./resources/iframeTest.js"></script>
 
 <script>
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe.tentative.html b/html/cross-origin-embedder-policy/credentialless/iframe.tentative.html
similarity index 86%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe.tentative.html
rename to html/cross-origin-embedder-policy/credentialless/iframe.tentative.html
index b023cce47f86fb..2b6c8399ea7a6f 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/iframe.tentative.html
+++ b/html/cross-origin-embedder-policy/credentialless/iframe.tentative.html
@@ -3,8 +3,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 
 <script>
 const same_origin = get_host_info().HTTPS_ORIGIN;
@@ -13,14 +13,14 @@
 const cookie_same_origin = "same_origin";
 const cookie_cross_origin = "cross_origin";
 
-// Operate on a window with COEP:cors-or-credentialless.
+// Operate on a window with COEP:credentialless.
 const w_token = token();
 const w_url = same_origin + executor_path + coep_credentialless +
               `&uuid=${w_token}`
 const w = window.open(w_url);
 add_completion_callback(() => w.close());
 
-// Check whether COEP:cors-or-credentialless applies to navigation request. It
+// Check whether COEP:credentialless applies to navigation request. It
 // shouldn't.
 const iframeTest = function(name, origin, expected_cookies) {
   promise_test_parallel(async test => {
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/image.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/image.tentative.https.html
similarity index 97%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/image.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/image.tentative.https.html
index f1419e15e91265..68783f4247c4c0 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/image.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/image.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 
 <script>
 
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/link.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/link.tentative.https.html
similarity index 97%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/link.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/link.tentative.https.html
index 9fc64926b31b03..c76c2dca90007e 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/link.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/link.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 
 <script>
 
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/redirect.tentative.html b/html/cross-origin-embedder-policy/credentialless/redirect.tentative.html
similarity index 92%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/redirect.tentative.html
rename to html/cross-origin-embedder-policy/credentialless/redirect.tentative.html
index 0aa8b2dfc45387..f4c0a4d22d3591 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/redirect.tentative.html
+++ b/html/cross-origin-embedder-policy/credentialless/redirect.tentative.html
@@ -3,8 +3,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 
 <script>
 const same_origin = get_host_info().HTTPS_ORIGIN;
@@ -13,7 +13,7 @@
 const cookie_same_origin = "same_origin";
 const cookie_cross_origin = "cross_origin";
 
-// Operate on a window with COEP:cors-or-credentialless.
+// Operate on a window with COEP:credentialless.:
 const w_token = token();
 const w_url = same_origin + executor_path + coep_credentialless +
               `&uuid=${w_token}`
diff --git a/html/cross-origin-embedder-policy/credentialless/resources/common.js b/html/cross-origin-embedder-policy/credentialless/resources/common.js
index 62f27aef47e29c..f203a82b01e0a6 100644
--- a/html/cross-origin-embedder-policy/credentialless/resources/common.js
+++ b/html/cross-origin-embedder-policy/credentialless/resources/common.js
@@ -6,13 +6,13 @@ const executor_js_path = directory + '/resources/executor.js?pipe=';
 const coep_none =
     '|header(Cross-Origin-Embedder-Policy,none)';
 const coep_credentialless =
-    '|header(Cross-Origin-Embedder-Policy,cors-or-credentialless)';
+    '|header(Cross-Origin-Embedder-Policy,credentialless)';
 const coep_require_corp =
     '|header(Cross-Origin-Embedder-Policy,require-corp)';
 
 // COEP-Report-Only
 const coep_report_only_credentialless =
-    '|header(Cross-Origin-Embedder-Policy-Report-Only,cors-or-credentialless)';
+    '|header(Cross-Origin-Embedder-Policy-Report-Only,credentialless)';
 
 // COOP
 const coop_same_origin =
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/resources/iframeTest.js b/html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js
similarity index 100%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/resources/iframeTest.js
rename to html/cross-origin-embedder-policy/credentialless/resources/iframeTest.js
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/script.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/script.tentative.https.html
similarity index 97%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/script.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/script.tentative.https.html
index cbed45dcc0215f..cac1d46d49dbcf 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/script.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/script.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 
 <script>
 
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/service-worker.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/service-worker.tentative.https.html
similarity index 96%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/service-worker.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/service-worker.tentative.https.html
index 14f6331c729a67..377bcceb8be475 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/service-worker.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/service-worker.tentative.https.html
@@ -1,13 +1,12 @@
 <!doctype html>
-<title>CORS or Credentialless and service worker</title>
 <meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script>
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/shared-worker.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/shared-worker.tentative.https.html
similarity index 85%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/shared-worker.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/shared-worker.tentative.https.html
index 0f13b9b2c6a963..7d0bc80bbe908d 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/shared-worker.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/shared-worker.tentative.https.html
@@ -1,12 +1,11 @@
 <!doctype html>
-<title>CORS or Credentialless and Shared worker</title>
 <meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 <script>
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
@@ -76,9 +75,9 @@
     }, `fetch ${description}`)
   };
 
-  // TODO(https://crbug.com/1200233). A COEP:cors-or-credentialless document
-  // shouldn't be able to load COEP:none SharedWorker. The sharedWorkerTest
-  // should listen for worker.onerror events and the expectations updated.
+  // TODO(https://crbug.com/1200233). A COEP:credentialless document shouldn't
+  // be able to load COEP:none SharedWorker. The sharedWorkerTest should listen
+  // for worker.onerror events and the expectations updated.
   sharedWorkerTest("same-origin",
     same_origin, coep_none,
     cookie_same_origin,
@@ -89,9 +88,9 @@
     cookie_same_origin,
     cookie_same_origin);
 
-  // TODO(https://crbug.com/1200233). A COEP:cors-or-credentialless document
-  // shouldn't be able to load COEP:none SharedWorker. The sharedWorkerTest
-  // should listen for worker.onerror events and the expectations updated.
+  // TODO(https://crbug.com/1200233). A COEP:credentialless document shouldn't
+  // be able to load COEP:none SharedWorker. The sharedWorkerTest should listen
+  // for worker.onerror events and the expectations updated.
   sharedWorkerTest("cross-origin",
     cross_origin, coep_none,
     cookie_cross_origin,
diff --git a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/video.tentative.https.html b/html/cross-origin-embedder-policy/credentialless/video.tentative.https.html
similarity index 97%
rename from html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/video.tentative.https.html
rename to html/cross-origin-embedder-policy/credentialless/video.tentative.https.html
index 8658ba9678bf0e..47a4024089a86f 100644
--- a/html/cross-origin-embedder-policy/credentialless/cors-or-credentialless/video.tentative.https.html
+++ b/html/cross-origin-embedder-policy/credentialless/video.tentative.https.html
@@ -2,8 +2,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/common/utils.js"></script>
-<script src="../resources/common.js"></script>
-<script src="../resources/dispatcher.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
 
 <script>