[Anonymous iframe] Improve test for popup

Bug: 1229998 Change-Id: Idf9dcbca1bd5c0e255fcf14279abbadfd8d0651e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3053483 Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org> Commit-Queue: Yifan Luo <lyf@chromium.org> Cr-Commit-Position: refs/heads/master@{#905198}
chromium · Jul 26, 2021 · d2f2e4f · d2f2e4f
1 parent 655522f
commit d2f2e4f
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/...cross-origin-embedder-policy/anonymous-iframe/anonymous-iframe-popup.tentative.https.html b/...cross-origin-embedder-policy/anonymous-iframe/anonymous-iframe-popup.tentative.https.html
@@ -3,6 +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="../credentialless/resources/common.js"></script>
+<script src="../credentialless/resources/dispatcher.js"></script>
 <body>
 <script>
 const {ORIGIN, REMOTE_ORIGIN} = get_host_info();
@@ -29,30 +31,41 @@
 // Create cross-origin popup from iframes. The opener should be blocked for
 // anonymous iframe and work for normal iframe.
 promise_test(async t => {
-  src_popup = REMOTE_ORIGIN + `/common/blank.html`;
-  const popup_1 = control_iframe.contentWindow.open(src_popup);
+  const control_token = token();
+  const control_src = REMOTE_ORIGIN + executor_path + `&uuid=${control_token}`;
+  const control_popup = control_iframe.contentWindow.open(control_src);
+  add_completion_callback(() => send(control_token, "close();"));
   assert_equals(
-    popup_1.opener, control_iframe.contentWindow,
+    control_popup.opener, control_iframe.contentWindow,
     "Opener from normal iframe should be available.");
 
-  const popup_2 = anonymous_iframe.contentWindow.open(src_popup);
+  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(
-    popup_2, null, "Opener from anonymous iframe should be blocked.");
+    anonymous_popup, null, "Opener from anonymous iframe should be blocked.");
 }, 'Cross-origin popup from normal/anonymous iframes.');
 
 // Create a same-origin popup from iframes. The opener should be blocked for
 // anonymous iframe and work for normal iframe.
 promise_test(async t => {
-  src_popup = ORIGIN + `/common/blank.html`;
-  const popup_1 = control_iframe.contentWindow.open(src_popup);
+  const control_token = token();
+  const control_src = REMOTE_ORIGIN + executor_path + `&uuid=${control_token}`;
+  const control_popup = control_iframe.contentWindow.open(control_src);
+  add_completion_callback(() => send(control_token, "close();"));
   assert_equals(
-    popup_1.opener, control_iframe.contentWindow,
+    control_popup.opener, control_iframe.contentWindow,
     "Opener from normal iframe should be available.");
 
-  const popup_2 = anonymous_iframe.contentWindow.open(src_popup);
+  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(
-    popup_2, null, "Opener from anonymous iframe should be blocked.");
+    anonymous_popup, null, "Opener from anonymous iframe should be blocked.");
 }, 'Same-origin popup from normal/anonymous iframes.');
-
 </script>
 </body>