From ab6e4893a39dae1552c1dacace76c814b6d4c607 Mon Sep 17 00:00:00 2001
From: Arthur Sonzogni <arthursonzogni@chromium.org>
Date: Tue, 22 Nov 2022 03:25:52 -0800
Subject: [PATCH] Rename anonymous iframe.

This addresses:
https://github.com/WICG/anonymous-iframe/issues/5

This renames:
- <iframe anonymous> into <iframe credentialless>
- window.anonymouslyFramed into window.credentialless

Before merging this patch, I will make sure to give
sufficient prior notice to Google Display Ads who are
doing some large scale experiment with the OT, which
this change might affect.

Change-Id: Idb53cfc059f2e0232903a10409f4d349e85498f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4016836
Commit-Queue: Mike West <mkwst@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1074551}
---
 ...ous-iframe-popup.tentative.https.window.js | 51 +++++++++---------
 ...anonymous-window.tentative.https.window.js | 30 +++++------
 .../cache-storage.tentative.https.window.js   | 10 ++--
 .../cookie-store.tentative.https.window.js    | 14 ++---
 .../cookie.tentative.https.window.js          | 42 +++++++--------
 .../embedding.tentative.https.window.js       | 45 +++++++++-------
 ...ced-frame-bypass.tentative.https.window.js | 32 ++++++------
 .../fenced-frame.tentative.https.window.js    | 17 +++---
 .../indexeddb.tentative.https.window.js       | 10 ++--
 ...l-empty-document.tentative.https.window.js | 18 +++----
 ...l-empty-document.tentative.https.window.js | 10 ++--
 .../local-storage.tentative.https.window.js   | 20 +++----
 ...anonymous-iframe.tentative.https.window.js | 16 +++---
 html/anonymous-iframe/resources/common.js     | 10 ++--
 .../resources/embedding-test.js               |  8 +--
 ...ker-partitioning.tentative.https.window.js | 44 ++++++++--------
 .../session-storage.tentative.https.window.js | 20 +++----
 ...ker-partitioning.tentative.https.window.js | 52 +++++++++----------
 .../web-lock.tentative.https.window.js        | 18 +++----
 19 files changed, 238 insertions(+), 229 deletions(-)

diff --git a/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js b/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js
index 66ca0bf2938fcf..fbdeeab4edb25e 100644
--- a/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js
+++ b/html/anonymous-iframe/anonymous-iframe-popup.tentative.https.window.js
@@ -6,7 +6,7 @@
 
 const {ORIGIN, REMOTE_ORIGIN} = get_host_info();
 const control_iframe = document.createElement('iframe');
-const anonymous_iframe = document.createElement('iframe');
+const iframe_credentialless = document.createElement('iframe');
 
 promise_setup(async t => {
   const createControlIframe = new Promise(async resolve => {
@@ -15,18 +15,18 @@ promise_setup(async t => {
     document.body.append(control_iframe);
   });
 
-  const createAnonymousIframe = new Promise(async resolve => {
-    anonymous_iframe.onload = resolve;
-    anonymous_iframe.src = ORIGIN + `/common/blank.html`;
-    anonymous_iframe.anonymous = true;
-    document.body.append(anonymous_iframe);
+  const createIframeCredentialless = new Promise(async resolve => {
+    iframe_credentialless.onload = resolve;
+    iframe_credentialless.src = ORIGIN + `/common/blank.html`;
+    iframe_credentialless.credentialless = true;
+    document.body.append(iframe_credentialless);
   });
 
-  await Promise.all([createControlIframe, createAnonymousIframe]);
+  await Promise.all([createControlIframe, createIframeCredentialless]);
 });
 
 // Create cross-origin popup from iframes. The opener should be blocked for
-// anonymous iframe and work for normal iframe.
+// credentialless iframe and work for normal iframe.
 promise_test(async t => {
   const control_token = token();
   const control_src = REMOTE_ORIGIN + executor_path + `&uuid=${control_token}`;
@@ -36,17 +36,18 @@ promise_test(async t => {
     control_popup.opener, control_iframe.contentWindow,
     "Opener from normal iframe should be available.");
 
-  const anonymous_token = token();
-  const anonymous_src =
-    REMOTE_ORIGIN + executor_path + `&uuid=${anonymous_token}`;
-  const anonymous_popup = anonymous_iframe.contentWindow.open(anonymous_src);
-  add_completion_callback(() => send(anonymous_token, "close();"));
-  assert_equals(
-    anonymous_popup, null, "Opener from anonymous iframe should be blocked.");
-}, 'Cross-origin popup from normal/anonymous iframes.');
+  const credentialless_token = token();
+  const credentialless_src =
+    REMOTE_ORIGIN + executor_path + `&uuid=${credentialless_token}`;
+  const credentialless_popup =
+    iframe_credentialless.contentWindow.open(credentialless_src);
+  add_completion_callback(() => send(credentialless_token, "close();"));
+  assert_equals(credentialless_popup, null,
+    "Opener from credentialless iframe should be blocked.");
+}, 'Cross-origin popup from normal/credentiallessiframes.');
 
 // Create a same-origin popup from iframes. The opener should be blocked for
-// anonymous iframe and work for normal iframe.
+// credentialless iframe and work for normal iframe.
 promise_test(async t => {
   const control_token = token();
   const control_src = ORIGIN + executor_path + `&uuid=${control_token}`;
@@ -56,11 +57,11 @@ promise_test(async t => {
     control_popup.opener, control_iframe.contentWindow,
     "Opener from normal iframe should be available.");
 
-  const anonymous_token = token();
-  const anonymous_src =
-    ORIGIN + executor_path + `&uuid=${anonymous_token}`;
-  const anonymous_popup = anonymous_iframe.contentWindow.open(anonymous_src);
-  add_completion_callback(() => send(anonymous_token, "close();"));
-  assert_equals(
-    anonymous_popup, null, "Opener from anonymous iframe should be blocked.");
-}, 'Same-origin popup from normal/anonymous iframes.');
+  const credentialless_token = token();
+  const credentialless_src =
+    ORIGIN + executor_path + `&uuid=${credentialless_token}`;
+  const credentialless_popup = iframe_credentialless.contentWindow.open(credentialless_src);
+  add_completion_callback(() => send(credentialless_token, "close();"));
+  assert_equals(credentialless_popup, null,
+    "Opener from credentialless iframe should be blocked.");
+}, 'Same-origin popup from normal/credentialless iframes.');
diff --git a/html/anonymous-iframe/anonymous-window.tentative.https.window.js b/html/anonymous-iframe/anonymous-window.tentative.https.window.js
index 16a242aacac952..8c9c1034299727 100644
--- a/html/anonymous-iframe/anonymous-window.tentative.https.window.js
+++ b/html/anonymous-iframe/anonymous-window.tentative.https.window.js
@@ -7,44 +7,44 @@ const {ORIGIN} = get_host_info();
 promise_test_parallel(async t => {
   const iframe = document.createElement("iframe");
   iframe.src = ORIGIN + "/common/blank.html?pipe=status(204)";
-  iframe.anonymous = false;
+  iframe.credentialless = false;
   document.body.appendChild(iframe);
-  iframe.anonymous = true;
+  iframe.credentialless = true;
   iframe.contentWindow.modified = true;
   iframe.src = ORIGIN + "/common/blank.html";
   // Wait for navigation to complete.
   await new Promise(resolve => iframe.onload = resolve);
-  assert_true(iframe.anonymous);
-  assert_true(iframe.contentWindow.anonymouslyFramed);
+  assert_true(iframe.credentialless);
+  assert_true(iframe.contentWindow.credentialless);
   assert_equals(undefined, iframe.contentWindow.modified);
-}, "Anonymous (false => true) => window not reused.");
+}, "Credentialless (false => true) => window not reused.");
 
 promise_test_parallel(async t => {
   const iframe = document.createElement("iframe");
   iframe.src = ORIGIN + "/common/blank.html?pipe=status(204)";
-  iframe.anonymous = true;
+  iframe.credentialless = true;
   document.body.appendChild(iframe);
-  iframe.anonymous = false;
+  iframe.credentialless = false;
   iframe.contentWindow.modified = true;
   iframe.src = ORIGIN + "/common/blank.html";
   // Wait for navigation to complete.
   await new Promise(resolve => iframe.onload = resolve);
-  assert_false(iframe.anonymous);
-  assert_false(iframe.contentWindow.anonymouslyFramed);
+  assert_false(iframe.credentialless);
+  assert_false(iframe.contentWindow.credentialless);
   assert_equals(undefined, iframe.contentWindow.modified);
-}, "Anonymous (true => false) => window not reused.");
+}, "Credentialless (true => false) => window not reused.");
 
 promise_test_parallel(async t => {
   const iframe = document.createElement("iframe");
-  iframe.anonymous = true;
+  iframe.credentialless = true;
   iframe.src = ORIGIN + "/common/blank.html?pipe=status(204)";
   document.body.appendChild(iframe);
-  iframe.anonymous = true;
+  iframe.credentialless = true;
   iframe.contentWindow.modified = true;
   iframe.src = ORIGIN + "/common/blank.html";
   // Wait for navigation to complete.
   await new Promise(resolve => iframe.onload = resolve);
-  assert_true(iframe.anonymous);
-  assert_true(iframe.contentWindow.anonymouslyFramed);
+  assert_true(iframe.credentialless);
+  assert_true(iframe.contentWindow.credentialless);
   assert_true(iframe.contentWindow.modified);
-}, "Anonymous (true => true) => window reused.");
+}, "Credentialless (true => true) => window reused.");
diff --git a/html/anonymous-iframe/cache-storage.tentative.https.window.js b/html/anonymous-iframe/cache-storage.tentative.https.window.js
index 8ce6410290a63b..b816de4cd5a8d9 100644
--- a/html/anonymous-iframe/cache-storage.tentative.https.window.js
+++ b/html/anonymous-iframe/cache-storage.tentative.https.window.js
@@ -33,27 +33,27 @@ promise_test(async test => {
   const key_1 = token();
   const key_2 = token();
 
-  // 2 actors: An anonymous iframe and a normal one.
-  const iframe_anonymous = newAnonymousIframe(origin);
+  // 2 actors: A credentialless iframe and a normal one.
+  const iframe_credentialless = newIframeCredentialless(origin);
   const iframe_normal = newIframe(origin);
   const response_queue_1 = token();
   const response_queue_2 = token();
 
   // 1. Each of them store a value in CacheStorage with different keys.
-  send(iframe_anonymous , store_script(key_1, "value_1", response_queue_1));
+  send(iframe_credentialless , store_script(key_1, "value_1", response_queue_1));
   send(iframe_normal, store_script(key_2, "value_2", response_queue_2));
   assert_equals(await receive(response_queue_1), "stored");
   assert_equals(await receive(response_queue_2), "stored");
 
   // 2. Each of them tries to retrieve the value from opposite side, without
   //    success.
-  send(iframe_anonymous , load_script(key_2, response_queue_1));
+  send(iframe_credentialless , load_script(key_2, response_queue_1));
   send(iframe_normal, load_script(key_1, response_queue_2));
   assert_equals(await receive(response_queue_1), "not found");
   assert_equals(await receive(response_queue_2), "not found");
 
   // 3. Each of them tries to retrieve the value from their side, with success:
-  send(iframe_anonymous , load_script(key_1, response_queue_1));
+  send(iframe_credentialless , load_script(key_1, response_queue_1));
   send(iframe_normal, load_script(key_2, response_queue_2));
   assert_equals(await receive(response_queue_1), "value_1");
   assert_equals(await receive(response_queue_2), "value_2");
diff --git a/html/anonymous-iframe/cookie-store.tentative.https.window.js b/html/anonymous-iframe/cookie-store.tentative.https.window.js
index 5338c8551f01e1..ddad924ea0d20d 100644
--- a/html/anonymous-iframe/cookie-store.tentative.https.window.js
+++ b/html/anonymous-iframe/cookie-store.tentative.https.window.js
@@ -5,18 +5,18 @@
 // META: script=/html/cross-origin-embedder-policy/credentialless/resources/common.js
 // META: script=./resources/common.js
 
-// A set of tests, checking cookies defined from within an anonymous iframe
+// A set of tests, checking cookies defined from within a credentialless iframe
 // continue to work.
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
 const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
 const cookie_key = token()
 
-const anonymous_iframe = newAnonymousIframe(cross_origin);
+const credentialless_iframe = newIframeCredentialless(cross_origin);
 
 // Install some helper functions in the child to observe Cookies:
 promise_setup(async () => {
-  await send(anonymous_iframe, `
+  await send(credentialless_iframe, `
     window.getMyCookie = () => {
       const value = "; " + document.cookie;
       const parts = value.split("; ${cookie_key}=");
@@ -44,7 +44,7 @@ promise_setup(async () => {
 
 promise_test(async test => {
   const this_token = token();
-  send(anonymous_iframe, `
+  send(credentialless_iframe, `
     document.cookie = "${cookie_key}=cookie_value_1";
     send("${this_token}", getMyCookie());
   `);
@@ -54,7 +54,7 @@ promise_test(async test => {
 
 promise_test(async test => {
   const resource_token = token();
-  send(anonymous_iframe, `
+  send(credentialless_iframe, `
     fetch("${showRequestHeaders(cross_origin, resource_token)}");
   `);
 
@@ -68,7 +68,7 @@ promise_test(async test => {
   const resource_url = cross_origin + "/common/blank.html?pipe=" +
     `|header(Set-Cookie,${cookie_key}=cookie_value_2;Path=/common/dispatcher)`;
   const this_token = token();
-  send(anonymous_iframe, `
+  send(credentialless_iframe, `
     const next_cookie_value = nextCookieValue();
     fetch("${resource_url}");
     send("${this_token}", await next_cookie_value);
@@ -82,7 +82,7 @@ promise_test(async test => {
   const resource_url = cross_origin + "/common/blank.html?pipe=" +
     `|header(Set-Cookie,${cookie_key}=cookie_value_3;Path=/common/dispatcher)`;
   const this_token = token();
-  send(anonymous_iframe, `
+  send(credentialless_iframe, `
     const next_cookie_value = nextCookieValue();
     const iframe = document.createElement("iframe");
     iframe.src = "${resource_url}";
diff --git a/html/anonymous-iframe/cookie.tentative.https.window.js b/html/anonymous-iframe/cookie.tentative.https.window.js
index 18d8f4b492d3d9..d6889ae52d0d13 100644
--- a/html/anonymous-iframe/cookie.tentative.https.window.js
+++ b/html/anonymous-iframe/cookie.tentative.https.window.js
@@ -6,7 +6,7 @@
 
 const same_origin = get_host_info().HTTPS_ORIGIN;
 const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
-const cookie_key = "anonymous_iframe_load_cookie";
+const cookie_key = "credentialless_iframe_load_cookie";
 const cookie_same_origin = "same_origin";
 const cookie_cross_origin = "cross_origin";
 
@@ -15,12 +15,12 @@ const cookieFromResource = async resource_token => {
   return parseCookies(headers)[cookie_key];
 };
 
-// Load an anonymous iframe, return the HTTP request cookies.
-const cookieFromAnonymousIframeRequest = async (iframe_origin) => {
+// Load a credentialless iframe, return the HTTP request cookies.
+const cookieFromCredentiallessIframeRequest = async (iframe_origin) => {
   const resource_token = token();
   let iframe = document.createElement("iframe");
   iframe.src = `${showRequestHeaders(iframe_origin, resource_token)}`;
-  iframe.anonymous = true;
+  iframe.credentialless = true;
   document.body.appendChild(iframe);
   return await cookieFromResource(resource_token);
 };
@@ -46,48 +46,48 @@ promise_test_parallel(async test => {
 
   promise_test_parallel(async test => {
     assert_equals(
-      await cookieFromAnonymousIframeRequest(same_origin),
+      await cookieFromCredentiallessIframeRequest(same_origin),
       undefined
     );
-  }, "Anonymous same-origin iframe is loaded without credentials");
+  }, "Credentialless same-origin iframe is loaded without credentials");
 
   promise_test_parallel(async test => {
     assert_equals(
-      await cookieFromAnonymousIframeRequest(cross_origin),
+      await cookieFromCredentiallessIframeRequest(cross_origin),
       undefined
     );
-  }, "Anonymous cross-origin iframe is loaded without credentials");
+  }, "Credentialless cross-origin iframe is loaded without credentials");
 
-  let iframe_same_origin = newAnonymousIframe(same_origin);
-  let iframe_cross_origin = newAnonymousIframe(cross_origin);
+  const iframe_same_origin = newIframeCredentialless(same_origin);
+  const iframe_cross_origin = newIframeCredentialless(cross_origin);
 
   promise_test_parallel(async test => {
     assert_equals(
       await cookieFromResourceInIframe(iframe_same_origin, same_origin),
       undefined
     );
-  }, "same_origin anonymous iframe can't send same_origin credentials");
+  }, "same_origin credentialless iframe can't send same_origin credentials");
 
   promise_test_parallel(async test => {
     assert_equals(
       await cookieFromResourceInIframe(iframe_same_origin, cross_origin),
       undefined
     );
-  }, "same_origin anonymous iframe can't send cross_origin credentials");
+  }, "same_origin credentialless iframe can't send cross_origin credentials");
 
   promise_test_parallel(async test => {
     assert_equals(
       await cookieFromResourceInIframe(iframe_cross_origin, cross_origin),
       undefined
     );
-  }, "cross_origin anonymous iframe can't send cross_origin credentials");
+  }, "cross_origin credentialless iframe can't send cross_origin credentials");
 
   promise_test_parallel(async test => {
     assert_equals(
       await cookieFromResourceInIframe(iframe_cross_origin, same_origin),
       undefined
     );
-  }, "cross_origin anonymous iframe can't send same_origin credentials");
+  }, "cross_origin credentialless iframe can't send same_origin credentials");
 
   promise_test_parallel(async test => {
     assert_equals(
@@ -95,7 +95,7 @@ promise_test_parallel(async test => {
                                        "iframe"),
       undefined
     );
-  }, "same_origin anonymous iframe can't send same_origin credentials "
+  }, "same_origin credentialless iframe can't send same_origin credentials "
                         + "on child iframe");
 
   promise_test_parallel(async test => {
@@ -104,8 +104,8 @@ promise_test_parallel(async test => {
                                        "iframe"),
       undefined
     );
-  }, "same_origin anonymous iframe can't send cross_origin credentials "
-                        + "on child iframe");
+  }, "same_origin credentialless iframe can't send cross_origin credentials "
+    + "on child iframe");
 
   promise_test_parallel(async test => {
     assert_equals(
@@ -113,8 +113,8 @@ promise_test_parallel(async test => {
                                        "iframe"),
       undefined
     );
-  }, "cross_origin anonymous iframe can't send cross_origin credentials "
-                        + "on child iframe");
+  }, "cross_origin credentialless iframe can't send cross_origin credentials "
+    + "on child iframe");
 
   promise_test_parallel(async test => {
     assert_equals(
@@ -122,7 +122,7 @@ promise_test_parallel(async test => {
                                        "iframe"),
       undefined
     );
-  }, "cross_origin anonymous iframe can't send same_origin credentials "
-                        + "on child iframe");
+  }, "cross_origin credentialless iframe can't send same_origin credentials "
+    + "on child iframe");
 
 }, "Setup")
diff --git a/html/anonymous-iframe/embedding.tentative.https.window.js b/html/anonymous-iframe/embedding.tentative.https.window.js
index 1a023947fc4a91..edaf49b95ccc40 100644
--- a/html/anonymous-iframe/embedding.tentative.https.window.js
+++ b/html/anonymous-iframe/embedding.tentative.https.window.js
@@ -1,10 +1,17 @@
-// META: variant=?1-2
-// META: variant=?3-4
-// META: variant=?5-6
-// META: variant=?7-8
-// META: variant=?9-10
-// META: variant=?11-12
+// META: variant=?1-1
+// META: variant=?2-2
+// META: variant=?3-3
+// META: variant=?4-4
+// META: variant=?5-5
+// META: variant=?6-6
+// META: variant=?7-7
+// META: variant=?8-8
+// META: variant=?9-9
+// META: variant=?10-10
+// META: variant=?11-11
+// META: variant=?12-12
 // META: variant=?13-last
+// META: timeout=long
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js
 // META: script=/common/subset-tests.js
@@ -17,27 +24,27 @@ const {REMOTE_ORIGIN} = get_host_info();
 
 // variant = 1
 subsetTest(embeddingTest,
-  "Parent embeds same-origin anonymous iframe", {
+  "Parent embeds same-origin credentialless iframe", {
   expectation: EXPECT_LOAD,
 });
 
 // variant = 2
 subsetTest(embeddingTest,
-  "Parent embeds cross-origin anonymous iframe", {
+  "Parent embeds cross-origin credentialless iframe", {
   child_origin: REMOTE_ORIGIN,
   expectation: EXPECT_LOAD,
 });
 
 // variant = 3
 subsetTest(embeddingTest,
-  "COEP:require-corp parent embeds same-origin anonymous iframe", {
+  "COEP:require-corp parent embeds same-origin credentialless iframe", {
   parent_headers: coep_require_corp,
   expectation: EXPECT_LOAD,
 });
 
 // variant = 4
 subsetTest(embeddingTest,
-  "COEP:require-corp parent embeds cross-origin anonymous iframe", {
+  "COEP:require-corp parent embeds cross-origin credentialless iframe", {
   parent_headers: coep_require_corp,
   child_origin: REMOTE_ORIGIN,
   expectation: EXPECT_LOAD,
@@ -45,14 +52,14 @@ subsetTest(embeddingTest,
 
 // variant = 5
 subsetTest(embeddingTest,
-  "COEP:credentialless parent embeds same-origin anonymous iframe", {
+  "COEP:credentialless parent embeds same-origin credentialless iframe", {
   parent_headers: coep_credentialless,
   expectation: EXPECT_LOAD,
 });
 
 // variant = 6
 subsetTest(embeddingTest,
-  "COEP:credentialless parent embeds cross-origin anonymous iframe", {
+  "COEP:credentialless parent embeds cross-origin credentialless iframe", {
   parent_headers: coep_credentialless,
   child_origin: REMOTE_ORIGIN,
   expectation: EXPECT_LOAD,
@@ -61,7 +68,7 @@ subsetTest(embeddingTest,
 // variant = 7
 // Regression test for https://crbug.com/1314369
 subsetTest(embeddingTest,
-  "COOP:same-origin + COEP:require-corp embeds same-origin anonymous iframe", {
+  "COOP:same-origin + COEP:require-corp embeds same-origin credentialless iframe", {
   parent_headers: coop_same_origin + coep_require_corp,
   expectation: EXPECT_LOAD,
 });
@@ -69,7 +76,7 @@ subsetTest(embeddingTest,
 // variant = 8
 // Regression test for https://crbug.com/1314369
 subsetTest(embeddingTest,
-  "COOP:same-origin + COEP:require-corp embeds cross-origin anonymous iframe", {
+  "COOP:same-origin + COEP:require-corp embeds cross-origin credentialless iframe", {
   parent_headers: coop_same_origin + coep_require_corp,
   child_origin: REMOTE_ORIGIN,
   expectation: EXPECT_LOAD,
@@ -78,7 +85,7 @@ subsetTest(embeddingTest,
 // variant = 9
 // Regression test for https://crbug.com/1314369
 subsetTest(embeddingTest,
-  "COOP:same-origin + COEP:credentialless embeds same-origin anonymous iframe", {
+  "COOP:same-origin + COEP:credentialless embeds same-origin credentialless iframe", {
   parent_headers: coop_same_origin + coep_credentialless,
   expectation: EXPECT_LOAD,
 });
@@ -86,7 +93,7 @@ subsetTest(embeddingTest,
 // variant = 10
 // Regression test for https://crbug.com/1314369
 subsetTest(embeddingTest,
-  "COOP:same-origin + COEP:credentialless embeds cross-origin anonymous iframe", {
+  "COOP:same-origin + COEP:credentialless embeds cross-origin credentialless iframe", {
   parent_headers: coop_same_origin + coep_credentialless,
   child_origin: REMOTE_ORIGIN,
   expectation: EXPECT_LOAD,
@@ -94,14 +101,14 @@ subsetTest(embeddingTest,
 
 // variant = 11
 subsetTest(embeddingTest,
-  "Parents embeds a CSP:frame-ancestore anonymous iframe", {
+  "Parents embeds a CSP:frame-ancestore credentialless iframe", {
   child_headers: "|headers(Content-Security-Policy,frame-ancestors 'none')",
   expectation: EXPECT_BLOCK,
 });
 
 // variant = 12
 subsetTest(embeddingTest,
-  "Cross-Origin-Isolated parent embeds same-origin COEP anonymous iframe", {
+  "Cross-Origin-Isolated parent embeds same-origin COEP credentialless iframe", {
   parent_headers: coop_same_origin + coep_require_corp,
   child_headers: coop_same_origin + coep_require_corp,
   expectation: EXPECT_LOAD,
@@ -109,7 +116,7 @@ subsetTest(embeddingTest,
 
 // variant = 13
 subsetTest(embeddingTest,
-  "Cross-Origin-Isolated parent embeds cross-origin COEP anonymous iframe", {
+  "Cross-Origin-Isolated parent embeds cross-origin COEP credentialless iframe", {
   parent_headers: coop_same_origin + coep_require_corp,
   child_headers: coop_same_origin + coep_require_corp,
   child_origin: REMOTE_ORIGIN,
diff --git a/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js b/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js
index 6cfd2c34d19d52..354abffb9ccd10 100644
--- a/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js
+++ b/html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.js
@@ -12,21 +12,21 @@ setup(() => {
 
 // 4 actors:
 //                         A (this document)
-//   ┌─────────────────────┴──┐
-// ┌─┼───────────────────┐    D  (anonymous-iframe)
-// │ B (fenced-frame)    │
-// │ │                   │
-// │ C (anonymous-iframe)│
-// └─────────────────────┘
+//   ┌─────────────────────┴───────┐
+// ┌─┼────────────────────────┐    D  (credentialless-iframe)
+// │ B (fenced-frame)         │
+// │ │                        │
+// │ C (credentialless-iframe)│
+// └──────────────────────────┘
 //
-// This test whether the two anonymous iframe can communicate and bypass the
+// This test whether the two credentialless iframe can communicate and bypass the
 // fencedframe boundary. This shouldn't happen.
 promise_test(async test => {
   const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
   const msg_queue = token();
 
   // Create the the 3 actors.
-  const anonymous_iframe_1 = newAnonymousIframe(cross_origin);
+  const iframe_credentialless_1 = newIframeCredentialless(cross_origin);
   const fenced_frame = newFencedFrame(cross_origin);
   send(fenced_frame, `
     const importScript = ${importScript};
@@ -36,22 +36,22 @@ promise_test(async test => {
     await importScript("/html/anonymous-iframe/resources/common.js");
     const support_loading_mode_fenced_frame =
       "|header(Supports-Loading-Mode,fenced-frame)";
-    const anonymous_iframe_2 =
-      newAnonymousIframe("${cross_origin}", support_loading_mode_fenced_frame);
-    send("${msg_queue}", anonymous_iframe_2);
+    const iframe_credentialless_2 = newIframeCredentialless("${cross_origin}",
+      support_loading_mode_fenced_frame);
+    send("${msg_queue}", iframe_credentialless_2);
   `);
-  const anonymous_iframe_2 = await receive(msg_queue);
+  const iframe_credentialless_2 = await receive(msg_queue);
 
-  // Try to communicate using BroadCastChannel, in between the two
-  // AnonymousIframe.
+  // Try to communicate using BroadCastChannel, in between the credentialless
+  // iframes.
   const bc_key = token();
-  send(anonymous_iframe_1, `
+  send(iframe_credentialless_1, `
     const bc = new BroadcastChannel("${bc_key}");
     bc.onmessage = event => send("${msg_queue}", event.data);
     send("${msg_queue}", "BroadcastChannel registered");
   `);
   assert_equals(await receive(msg_queue), "BroadcastChannel registered");
-  await send(anonymous_iframe_2, `
+  await send(iframe_credentialless_2, `
     const bc = new BroadcastChannel("${bc_key}");
     bc.postMessage("Can communicate");
   `);
diff --git a/html/anonymous-iframe/fenced-frame.tentative.https.window.js b/html/anonymous-iframe/fenced-frame.tentative.https.window.js
index f5f71bfe0b16f4..675c136606201f 100644
--- a/html/anonymous-iframe/fenced-frame.tentative.https.window.js
+++ b/html/anonymous-iframe/fenced-frame.tentative.https.window.js
@@ -10,16 +10,17 @@ setup(() => {
     "HTMLFencedFrameElement is not supported.");
 })
 
-// Check whether this anonymous bit propagates toward FencedFrame. It shouldn't.
+// Check whether this credentialless bit propagates toward FencedFrame. It
+// shouldn't.
 promise_test(async test => {
   const origin = get_host_info().HTTPS_ORIGIN;
   const msg_queue = token();
 
-  // 1. Create an anonymous iframe.
-  const frame_anonymous = newAnonymousIframe(origin);
+  // 1. Create a credentialless iframe.
+  const iframe_credentialless = newIframeCredentialless(origin);
 
   // 2. Create a FencedFrame within it.
-  send(frame_anonymous, `
+  send(iframe_credentialless, `
     const importScript = ${importScript};
     await importScript("/common/utils.js");
     await importScript("/html/cross-origin-embedder-policy/credentialless" +
@@ -30,10 +31,10 @@ promise_test(async test => {
   `);
   const frame_fenced = await receive(msg_queue);
 
-  // 3. Expect it not to be considered anonymous.
+  // 3. Expect it not to be considered credentialless.
   send(frame_fenced, `
-    send("${msg_queue}", window.anonymouslyFramed);
+    send("${msg_queue}", window.credentialless);
   `);
   assert_equals(await receive(msg_queue), "false",
-    "Check window.anonymouslyFramed in FencedFrame");
-}, 'FencedFrame within an AnonymousIframe is not anonymous')
+    "Check window.credentialless in FencedFrame");
+}, 'FencedFrame within a credentialless iframe is not credentialless')
diff --git a/html/anonymous-iframe/indexeddb.tentative.https.window.js b/html/anonymous-iframe/indexeddb.tentative.https.window.js
index 197d7828c84bee..d2749c6be2f8e2 100644
--- a/html/anonymous-iframe/indexeddb.tentative.https.window.js
+++ b/html/anonymous-iframe/indexeddb.tentative.https.window.js
@@ -50,11 +50,11 @@ const read_script = (done) => `
 `;
 
 promise_test(async test => {
-  // 4 actors: 2 anonymous iframe and 2 normal iframe.
+  // 4 actors: 2 credentialless iframe and 2 normal iframe.
   const origin = get_host_info().HTTPS_REMOTE_ORIGIN;
   const iframes = [
-    newAnonymousIframe(origin),
-    newAnonymousIframe(origin),
+    newIframeCredentialless(origin),
+    newIframeCredentialless(origin),
     newIframe(origin),
     newIframe(origin),
   ];
@@ -80,8 +80,8 @@ promise_test(async test => {
   }));
 
 
-  // Verify the two anonymous iframe share the same state and the normal iframe
-  // share a second state
+  // Verify the two credentialless iframe share the same state and the normal
+  // iframe share a second state
   assert_equals(states[0][keys[0]], values[0]);
   assert_equals(states[0][keys[1]], values[1]);
   assert_equals(states[0][keys[2]], undefined);
diff --git a/html/anonymous-iframe/initial-empty-document.tentative.https.window.js b/html/anonymous-iframe/initial-empty-document.tentative.https.window.js
index 48600f53b1200d..8d8b0955889aff 100644
--- a/html/anonymous-iframe/initial-empty-document.tentative.https.window.js
+++ b/html/anonymous-iframe/initial-empty-document.tentative.https.window.js
@@ -5,17 +5,17 @@ const {ORIGIN} = get_host_info();
 
 promise_test_parallel(async t => {
   const parent = document.createElement("iframe");
-  parent.anonymous = true;
+  parent.credentialless = true;
   document.body.appendChild(parent);
   parent.src = ORIGIN + "/common/blank.html";
   // Wait for navigation to complete.
   await new Promise(resolve => parent.onload = resolve);
-  assert_true(parent.anonymous);
+  assert_true(parent.credentialless);
 
   const child = document.createElement("iframe");
   parent.contentDocument.body.appendChild(child);
-  assert_false(child.anonymous);
-  assert_true(child.contentWindow.anonymouslyFramed);
+  assert_false(child.credentialless);
+  assert_true(child.contentWindow.credentialless);
 }, "Initial empty document inherits from parent's document.");
 
 promise_test_parallel(async t => {
@@ -24,11 +24,11 @@ promise_test_parallel(async t => {
   parent.src = ORIGIN + "/common/blank.html";
   // Wait for navigation to complete.
   await new Promise(resolve => parent.onload = resolve);
-  assert_false(parent.anonymous);
+  assert_false(parent.credentialless);
 
   const child = document.createElement("iframe");
-  child.anonymous = true;
+  child.credentialless = true;
   parent.contentDocument.body.appendChild(child);
-  assert_true(child.anonymous);
-  assert_true(child.contentWindow.anonymouslyFramed);
-}, "Initial empty document inherits from its's iframe's anonymous attribute.");
+  assert_true(child.credentialless);
+  assert_true(child.contentWindow.credentialless);
+}, "Initial empty document inherits from its's iframe's credentialless attribute.");
diff --git a/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js b/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js
index 985699e25f79c8..fc58aaed908cf5 100644
--- a/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js
+++ b/html/anonymous-iframe/local-storage-initial-empty-document.tentative.https.window.js
@@ -5,18 +5,18 @@
 // META: script=./resources/common.js
 
 // This test verifies the behavior of the initial empty document nested inside
-// anonymous iframes.
+// credentialless iframes.
 //
 // The following tree of frames and documents is used:
 //  A
-//  ├──B (anonymous)
+//  ├──B (credentialless)
 //  │  └──D (initial empty document)
 //  └──C (control)
 //     └──E (initial empty document)
 //
 // Storage used for D and E must be different.
 promise_test(async test => {
-  const iframe_B = newAnonymousIframe(origin);
+  const iframe_B = newIframeCredentialless(origin);
   const iframe_C = newIframe(origin);
 
   // Create iframe_D and store a value in localStorage.
@@ -60,11 +60,11 @@ promise_test(async test => {
     send("${queue_C}", value_E);
   `);
 
-  // Verify the anonymous iframe and the normal one do not have access to each
+  // Verify the credentialless iframe and the normal one do not have access to each
   // other.
   assert_equals(await receive(queue_B), value_D); // key_D
   assert_equals(await receive(queue_B), "");      // key_E
   assert_equals(await receive(queue_C), "");      // key_D
   assert_equals(await receive(queue_C), value_E); // key_E
-}, "Local storage is correctly partitioned with regards to anonymous iframe " +
+}, "Local storage is correctly partitioned with regards to credentialless iframe " +
    "in initial empty documents.");
diff --git a/html/anonymous-iframe/local-storage.tentative.https.window.js b/html/anonymous-iframe/local-storage.tentative.https.window.js
index 2734f12d9e6839..bd80ff47295ded 100644
--- a/html/anonymous-iframe/local-storage.tentative.https.window.js
+++ b/html/anonymous-iframe/local-storage.tentative.https.window.js
@@ -30,28 +30,28 @@ promise_test(async test => {
   const key_1 = token();
   const key_2 = token();
 
-  // 4 actors: 2 anonymous iframe and 2 normal iframe.
-  const iframe_anonymous_1 = newAnonymousIframe(origin);
-  const iframe_anonymous_2 = newAnonymousIframe(origin);
+  // 4 actors: 2 credentialless iframe and 2 normal iframe.
+  const iframe_credentialless_1 = newIframeCredentialless(origin);
+  const iframe_credentialless_2 = newIframeCredentialless(origin);
   const iframe_normal_1 = newIframe(origin);
   const iframe_normal_2 = newIframe(origin);
 
-  // 1. Store a value in one anonymous iframe and one normal iframe.
+  // 1. Store a value in one credentialless iframe and one normal iframe.
   await Promise.all([
-    store(iframe_anonymous_1, key_1, "value_1"),
+    store(iframe_credentialless_1, key_1, "value_1"),
     store(iframe_normal_1, key_2, "value_2"),
   ]);
 
   // 2. Check what each of them can retrieve.
   await Promise.all([
-    load(iframe_anonymous_1, key_1, "value_1"),
-    load(iframe_anonymous_2, key_1, "value_1"),
-    load(iframe_anonymous_1, key_2, "not found"),
-    load(iframe_anonymous_2, key_2, "not found"),
+    load(iframe_credentialless_1, key_1, "value_1"),
+    load(iframe_credentialless_2, key_1, "value_1"),
+    load(iframe_credentialless_1, key_2, "not found"),
+    load(iframe_credentialless_2, key_2, "not found"),
 
     load(iframe_normal_1, key_1, "not found"),
     load(iframe_normal_2, key_1, "not found"),
     load(iframe_normal_1, key_2, "value_2"),
     load(iframe_normal_2, key_2, "value_2"),
   ]);
-}, "Local storage is correctly partitioned with regards to anonymous iframe");
+}, "Local storage is correctly partitioned with regards to credentialless iframe");
diff --git a/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js b/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js
index d720008ccc7447..ccaa41f9ef10d7 100644
--- a/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js
+++ b/html/anonymous-iframe/require-corp-embed-anonymous-iframe.tentative.https.window.js
@@ -23,9 +23,9 @@ promise_test(async t => {
     resolve(false);
   });
 
-  // Create an anonymous child iframe.
+  // Create a credentialless child iframe.
   const child = document.createElement("iframe");
-  child.anonymous = true;
+  child.credentialless = true;
   t.add_cleanup(() => child.remove());
 
   child.src = "/html/cross-origin-embedder-policy/resources/" +
@@ -33,11 +33,11 @@ promise_test(async t => {
   document.body.append(child);
 
   assert_true(await iframe_allowed(child),
-              "The anonymous iframe should be allowed.");
+              "The credentialless iframe should be allowed.");
 
-  // Create a child of the anonymous iframe. Even if the grandchild
-  // does not have the 'anonymous' attribute set, it inherits the
-  // anonymous property from the parent.
+  // Create a child of the credentialless iframe. Even if the grandchild
+  // does not have the 'credentialless' attribute set, it inherits the
+  // credentialless property from the parent.
   const grandchild = child.contentDocument.createElement("iframe");
 
   grandchild.src = "/html/cross-origin-embedder-policy/resources/" +
@@ -45,5 +45,5 @@ promise_test(async t => {
   child.contentDocument.body.append(grandchild);
 
   assert_true(await iframe_allowed(grandchild),
-             "The child of the anonymous iframe should be allowed.");
-}, 'Loading an anonymous iframe with COEP: require-corp is allowed.');
+             "The child of the credentialless iframe should be allowed.");
+}, 'Loading a credentialless iframe with COEP: require-corp is allowed.');
diff --git a/html/anonymous-iframe/resources/common.js b/html/anonymous-iframe/resources/common.js
index e83bd094670dd4..fea3ecc5a6f12b 100644
--- a/html/anonymous-iframe/resources/common.js
+++ b/html/anonymous-iframe/resources/common.js
@@ -1,12 +1,12 @@
-// Create an anonymous iframe. The new document will execute any scripts sent
-// toward the token it returns.
-const newAnonymousIframe = (child_origin, opt_headers) => {
+// Create a credentialless iframe. The new document will execute any scripts
+// sent toward the token it returns.
+const newIframeCredentialless = (child_origin, opt_headers) => {
   opt_headers ||= "";
   const sub_document_token = token();
   let iframe = document.createElement('iframe');
   iframe.src = child_origin + executor_path + opt_headers +
     `&uuid=${sub_document_token}`;
-  iframe.anonymous = true;
+  iframe.credentialless = true;
   document.body.appendChild(iframe);
   return sub_document_token;
 };
@@ -17,7 +17,7 @@ const newIframe = (child_origin) => {
   const sub_document_token = token();
   let iframe = document.createElement('iframe');
   iframe.src = child_origin + executor_path + `&uuid=${sub_document_token}`;
-  iframe.anonymous = false
+  iframe.credentialless = false
   document.body.appendChild(iframe);
   return sub_document_token;
 };
diff --git a/html/anonymous-iframe/resources/embedding-test.js b/html/anonymous-iframe/resources/embedding-test.js
index 414d9cfc40834e..fb5d11efa06827 100644
--- a/html/anonymous-iframe/resources/embedding-test.js
+++ b/html/anonymous-iframe/resources/embedding-test.js
@@ -10,7 +10,7 @@ setup({ explicit_timeout: true });
 const EXPECT_LOAD = "load";
 const EXPECT_BLOCK = "block";
 
-// Load an anonymous iframe. Control both the parent and the child headers.
+// Load a credentialless iframe. Control both the parent and the child headers.
 // Check whether it loaded or not.
 const embeddingTest = (description, {
   parent_headers,
@@ -41,7 +41,7 @@ const embeddingTest = (description, {
     // The parent creates its child:
     await send(parent_token, `
       const iframe = document.createElement("iframe");
-      iframe.anonymous = true;
+      iframe.credentialless = true;
       iframe.src = "${child_url}";
       document.body.appendChild(iframe);
     `);
@@ -63,8 +63,8 @@ const embeddingTest = (description, {
     //   timing out. False-negative are not a problem, they just need not to
     //   overwhelm the true-negative, which is trivial to get.
     step_timeout(() => send(reply_token, "block"), expectation == EXPECT_BLOCK
-      ? 2000
-      : 6000
+      ? 1500
+      : 3500
     );
 
     assert_equals(await receive(reply_token), expectation);
diff --git a/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js b/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js
index dd78195a3c8ba9..14997a475433e7 100644
--- a/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js
+++ b/html/anonymous-iframe/serviceworker-partitioning.tentative.https.window.js
@@ -4,26 +4,26 @@ const sw_url = location.pathname.replace(/[^/]*$/, '') +
       "./resources/serviceworker-partitioning-helper.js";
 
 promise_test(async t => {
-  // Create 4 iframes (two normal and two anonymous ones) and register
+  // Create 4 iframes (two normal and two credentialless ones) and register
   // a serviceworker with the same scope and url in all of them.
   //
   // Registering the same service worker again with the same url and
-  // scope is a no-op. However, anonymous iframes get partitioned
+  // scope is a no-op. However, credentialless iframes get partitioned
   // service workers, so we should have a total of 2 service workers
-  // at the end (one for the normal iframes and one for the anonymous
+  // at the end (one for the normal iframes and one for the credentialless
   // ones).
   let iframes = await Promise.all([
-    { name: "normal", anonymous: false},
-    { name: "normal_control", anonymous: false},
-    { name: "anonymous", anonymous: true},
-    { name: "anonymous_control", anonymous: true},
-  ].map(async ({name, anonymous}) => {
+    { name: "normal", credentialless: false},
+    { name: "normal_control", credentialless: false},
+    { name: "credentialless", credentialless: true},
+    { name: "credentialless_control", credentialless: true},
+  ].map(async ({name, credentialless}) => {
 
     let iframe = await new Promise(resolve => {
       let iframe = document.createElement('iframe');
       iframe.onload = () => resolve(iframe);
       iframe.src = '/common/blank.html';
-      if (anonymous) iframe.anonymous = true;
+      if (credentialless) iframe.credentialless = true;
       document.body.append(iframe);
     });
 
@@ -58,28 +58,28 @@ promise_test(async t => {
   // "normal_control" iframes.
   assert_true(!!msgs[0]["normal"]);
   assert_true(!!msgs[0]["normal_control"]);
-  assert_false(!!msgs[0]["anonymous"]);
-  assert_false(!!msgs[0]["anonymous_control"]);
+  assert_false(!!msgs[0]["credentialless"]);
+  assert_false(!!msgs[0]["credentialless_control"]);
 
   // The "normal_control" iframe shares the same serviceworker as the "normal"
   // iframe.
   assert_true(!!msgs[1]["normal"]);
   assert_true(!!msgs[1]["normal_control"]);
-  assert_false(!!msgs[1]["anonymous"]);
-  assert_false(!!msgs[1]["anonymous_control"]);
+  assert_false(!!msgs[1]["credentialless"]);
+  assert_false(!!msgs[1]["credentialless_control"]);
 
-  // The "anonymous" iframe serviceworker belongs to the "anonymous" and the
-  // "anonymous_control" iframes.
+  // The "credentialless" iframe serviceworker belongs to the "credentialless"
+  // and the "credentialless_control" iframes.
   assert_false(!!msgs[2]["normal"]);
   assert_false(!!msgs[2]["normal_control"]);
-  assert_true(!!msgs[2]["anonymous"]);
-  assert_true(!!msgs[2]["anonymous_control"]);
+  assert_true(!!msgs[2]["credentialless"]);
+  assert_true(!!msgs[2]["credentialless_control"]);
 
-  // The "anonymous_control" iframe shares the same serviceworker as
-  // the "anonymous" iframe.
+  // The "credentialless_control" iframe shares the same serviceworker as the
+  // "credentialless" iframe.
   assert_false(!!msgs[3]["normal"]);
   assert_false(!!msgs[3]["normal_control"]);
-  assert_true(!!msgs[3]["anonymous"]);
-  assert_true(!!msgs[3]["anonymous_control"]);
+  assert_true(!!msgs[3]["credentialless"]);
+  assert_true(!!msgs[3]["credentialless_control"]);
 
-}, "Anonymous iframes get partitioned service workers.");
+}, "credentialless iframes get partitioned service workers.");
diff --git a/html/anonymous-iframe/session-storage.tentative.https.window.js b/html/anonymous-iframe/session-storage.tentative.https.window.js
index 94fbd842ac6729..425886ce382d47 100644
--- a/html/anonymous-iframe/session-storage.tentative.https.window.js
+++ b/html/anonymous-iframe/session-storage.tentative.https.window.js
@@ -30,28 +30,28 @@ promise_test(async test => {
   const key_1 = token();
   const key_2 = token();
 
-  // 4 actors: 2 anonymous iframe and 2 normal iframe.
-  const iframe_anonymous_1 = newAnonymousIframe(origin);
-  const iframe_anonymous_2 = newAnonymousIframe(origin);
+  // 4 actors: 2 credentialless iframe and 2 normal iframe.
+  const iframe_credentialless_1 = newIframeCredentialless(origin);
+  const iframe_credentialless_2 = newIframeCredentialless(origin);
   const iframe_normal_1 = newIframe(origin);
   const iframe_normal_2 = newIframe(origin);
 
-  // 1. Store a value in one anonymous iframe and one normal iframe.
+  // 1. Store a value in one credentialless iframe and one normal iframe.
   await Promise.all([
-    store(iframe_anonymous_1, key_1, "value_1"),
+    store(iframe_credentialless_1, key_1, "value_1"),
     store(iframe_normal_1, key_2, "value_2"),
   ]);
 
   // 2. Check what each of them can retrieve.
   await Promise.all([
-    load(iframe_anonymous_1, key_1, "value_1"),
-    load(iframe_anonymous_2, key_1, "value_1"),
-    load(iframe_anonymous_1, key_2, "not found"),
-    load(iframe_anonymous_2, key_2, "not found"),
+    load(iframe_credentialless_1, key_1, "value_1"),
+    load(iframe_credentialless_2, key_1, "value_1"),
+    load(iframe_credentialless_1, key_2, "not found"),
+    load(iframe_credentialless_2, key_2, "not found"),
 
     load(iframe_normal_1, key_1, "not found"),
     load(iframe_normal_2, key_1, "not found"),
     load(iframe_normal_1, key_2, "value_2"),
     load(iframe_normal_2, key_2, "value_2"),
   ]);
-}, "Session storage is correctly partitioned with regards to anonymous iframe");
+}, "Session storage is correctly partitioned with regards to credentialless iframe");
diff --git a/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js b/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js
index a6eb551759d865..6c373ee4903b56 100644
--- a/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js
+++ b/html/anonymous-iframe/sharedworker-partitioning.tentative.https.window.js
@@ -4,25 +4,25 @@ const sw_url = location.pathname.replace(/[^/]*$/, '') +
       "./resources/sharedworker-partitioning-helper.js";
 
 promise_test(async t => {
-  // Create 4 iframes (two normal and two anonymous ones) and create
+  // Create 4 iframes (two normal and two credentialless ones) and create
   // a shared worker with the same url in all of them.
   //
   // Creating the same shared worker again with the same url is a
-  // no-op. However, anonymous iframes get partitioned shared workers,
+  // no-op. However, credentialless iframes get partitioned shared workers,
   // so we should have a total of 2 shared workers at the end (one for
-  // the normal iframes and one for the anonymous ones).
+  // the normal iframes and one for the credentialless ones).
   let iframes = await Promise.all([
-    { name: "normal", anonymous: false},
-    { name: "normal_control", anonymous: false},
-    { name: "anonymous", anonymous: true},
-    { name: "anonymous_control", anonymous: true},
-  ].map(async ({name, anonymous}) => {
+    { name: "normal", credentialless: false},
+    { name: "normal_control", credentialless: false},
+    { name: "credentialless", credentialless: true},
+    { name: "credentialless_control", credentialless: true},
+  ].map(async ({name, credentialless}) => {
 
     let iframe = await new Promise(resolve => {
       let iframe = document.createElement('iframe');
       iframe.onload = () => resolve(iframe);
       iframe.src = '/common/blank.html';
-      if (anonymous) iframe.anonymous = true;
+      if (credentialless) iframe.credentialless = true;
       document.body.append(iframe);
     });
 
@@ -54,8 +54,8 @@ promise_test(async t => {
   // "normal_control" iframes.
   assert_true(!!msgs[0]["normal"] &&
               !!msgs[0]["normal_control"] &&
-              !msgs[0]["anonymous"] &&
-              !msgs[0]["anonymous_control"],
+              !msgs[0]["credentialless"] &&
+              !msgs[0]["credentialless_control"],
               'The "normal" iframe\'s sharedworker should return ' +
               '{"normal": true, "normal_control": true}, ' +
               'but instead returned ' + JSON.stringify(msgs[0]));
@@ -64,30 +64,30 @@ promise_test(async t => {
   // iframe.
   assert_true(!!msgs[1]["normal"] &&
               !!msgs[1]["normal_control"] &&
-              !msgs[1]["anonymous"] &&
-              !msgs[1]["anonymous_control"],
+              !msgs[1]["credentialless"] &&
+              !msgs[1]["credentialless_control"],
               'The "normal_control" iframe\'s sharedworker should return ' +
               '{"normal": true, "normal_control": true}, ' +
               'but instead returned ' + JSON.stringify(msgs[1]));
 
-  // The "anonymous" iframe sharedworker belongs to the "anonymous" and the
-  // "anonymous_control" iframes.
+  // The "credentialless" iframe sharedworker belongs to the "credentialless" and the
+  // "credentialless_control" iframes.
   assert_true(!msgs[2]["normal"] &&
               !msgs[2]["normal_control"] &&
-              !!msgs[2]["anonymous"] &&
-              !!msgs[2]["anonymous_control"],
-              'The "anonymous" iframe\'s sharedworker should return ' +
-              '{"anonymous": true, "anonymous_control": true}, ' +
+              !!msgs[2]["credentialless"] &&
+              !!msgs[2]["credentialless_control"],
+              'The "credentialless" iframe\'s sharedworker should return ' +
+              '{"credentialless": true, "credentialless_control": true}, ' +
               'but instead returned ' + JSON.stringify(msgs[2]));
 
-  // The "anonymous_control" iframe shares the same sharedworker as
-  // the "anonymous" iframe.
+  // The "credentialless_control" iframe shares the same sharedworker as
+  // the "credentialless" iframe.
   assert_true(!msgs[3]["normal"] &&
               !msgs[3]["normal_control"] &&
-              !!msgs[3]["anonymous"] &&
-              !!msgs[3]["anonymous_control"],
-              'The "anonymous_control" iframe\'s sharedworker should return ' +
-              '{"anonymous": true, "anonymous_control": true}, ' +
+              !!msgs[3]["credentialless"] &&
+              !!msgs[3]["credentialless_control"],
+              'The "credentialless_control" iframe\'s sharedworker should return ' +
+              '{"credentialless": true, "credentialless_control": true}, ' +
               'but instead returned ' + JSON.stringify(msgs[3]));
 
-}, "Anonymous iframes get partitioned shared workers.");
+}, "credentialless iframes get partitioned shared workers.");
diff --git a/html/anonymous-iframe/web-lock.tentative.https.window.js b/html/anonymous-iframe/web-lock.tentative.https.window.js
index ed1da0b9ad7106..fbee4ad28eba07 100644
--- a/html/anonymous-iframe/web-lock.tentative.https.window.js
+++ b/html/anonymous-iframe/web-lock.tentative.https.window.js
@@ -37,39 +37,39 @@ promise_test(async test => {
   const key_1 = token();
   const key_2 = token();
 
-  // 2 actors: An anonymous iframe and a normal one.
-  const iframe_anonymous = newAnonymousIframe(origin);
+  // 2 actors: A credentialless iframe and a normal one.
+  const iframe_credentialless = newIframeCredentialless(origin);
   const iframe_normal = newIframe(origin);
   const response_queue_1 = token();
   const response_queue_2 = token();
 
   // 1. Hold two different locks on both sides.
-  send(iframe_anonymous, acquire_script(key_1, response_queue_1));
+  send(iframe_credentialless, acquire_script(key_1, response_queue_1));
   send(iframe_normal, acquire_script(key_2, response_queue_2));
   assert_equals(await receive(response_queue_1), "locked");
   assert_equals(await receive(response_queue_2), "locked");
-  await assertHeldKeys(iframe_anonymous, [key_1]);
+  await assertHeldKeys(iframe_credentialless, [key_1]);
   await assertHeldKeys(iframe_normal, [key_2]);
 
   // 2. Try to acquire the lock with the same key on the opposite side. It
   //    shouldn't block, because they are partitioned.
-  send(iframe_anonymous , acquire_script(key_2, response_queue_1));
+  send(iframe_credentialless , acquire_script(key_2, response_queue_1));
   send(iframe_normal, acquire_script(key_1, response_queue_2));
   assert_equals(await receive(response_queue_1), "locked");
   assert_equals(await receive(response_queue_2), "locked");
-  await assertHeldKeys(iframe_anonymous, [key_1, key_2]);
+  await assertHeldKeys(iframe_credentialless, [key_1, key_2]);
   await assertHeldKeys(iframe_normal, [key_1, key_2]);
 
   // 3. Cleanup: release the 4 locks (2 on each sides).
-  send(iframe_anonymous, release_script(response_queue_1));
+  send(iframe_credentialless, release_script(response_queue_1));
   assert_equals(await receive(response_queue_1), "unlocked");
   assert_equals(await receive(response_queue_1), "unlocked");
-  await assertHeldKeys(iframe_anonymous, []);
+  await assertHeldKeys(iframe_credentialless, []);
   await assertHeldKeys(iframe_normal, [key_1, key_2]);
 
   send(iframe_normal, release_script(response_queue_2));
   assert_equals(await receive(response_queue_2), "unlocked");
   assert_equals(await receive(response_queue_2), "unlocked");
-  await assertHeldKeys(iframe_anonymous, []);
+  await assertHeldKeys(iframe_credentialless, []);
   await assertHeldKeys(iframe_normal, []);
 })