From e280694455aad33f8d16db0f2fe018ae5ded8970 Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Thu, 9 Jan 2020 16:14:15 +0100
Subject: [PATCH 1/2] COOP: test iframe sandbox without allow-same-origin

Part of #18354.
---
 .../coop-sandbox.https.html                   | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/html/cross-origin-opener-policy/coop-sandbox.https.html b/html/cross-origin-opener-policy/coop-sandbox.https.html
index fc16c186cadf44..43ad0a0cabc696 100644
--- a/html/cross-origin-opener-policy/coop-sandbox.https.html
+++ b/html/cross-origin-opener-policy/coop-sandbox.https.html
@@ -5,20 +5,25 @@
 <script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
 <div id=log>
 <script>
-async_test(t => {
-  const frame = document.createElement("iframe");
-  const channel = new BroadcastChannel(token());
-  channel.onmessage = t.unreached_func("A COOP popup was created from a sandboxed frame");
-  t.add_cleanup(() => frame.remove());
-  frame.sandbox = "allow-popups allow-scripts allow-same-origin";
-  frame.srcdoc = `<script>
-const popup = window.open("resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}");
-<\/script>`;
-  document.body.append(frame);
-  window.onload = t.step_func(() => {
-    t.step_timeout(() => {
-      t.done()
-    }, 1500);
-  });
+[
+  "allow-popups allow-scripts allow-same-origin",
+  "allow-popups allow-scripts",
+].forEach(sandboxValue => {
+  async_test(t => {
+    const frame = document.createElement("iframe");
+    const channel = new BroadcastChannel(token());
+    channel.onmessage = t.unreached_func("A COOP popup was created from a sandboxed frame");
+    t.add_cleanup(() => frame.remove());
+    frame.sandbox = sandboxValue;
+    frame.srcdoc = `<script>
+  const popup = window.open("resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}");
+  <\/script>`;
+    document.body.append(frame);
+    window.onload = t.step_func(() => {
+      t.step_timeout(() => {
+        t.done()
+      }, 1500);
+    });
+  }, `<iframe sandbox="${sandboxValue}"> ${document.title}`);
 });
 </script>

From d4b2d24fb1dac92e130f49e236b0c7dabeccc607 Mon Sep 17 00:00:00 2001
From: Simon Pieters <zcorpan@gmail.com>
Date: Thu, 9 Jan 2020 16:30:17 +0100
Subject: [PATCH 2/2] Use addEventListener

---
 html/cross-origin-opener-policy/coop-sandbox.https.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cross-origin-opener-policy/coop-sandbox.https.html b/html/cross-origin-opener-policy/coop-sandbox.https.html
index 43ad0a0cabc696..5fd11643d5720f 100644
--- a/html/cross-origin-opener-policy/coop-sandbox.https.html
+++ b/html/cross-origin-opener-policy/coop-sandbox.https.html
@@ -19,11 +19,11 @@
   const popup = window.open("resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}");
   <\/script>`;
     document.body.append(frame);
-    window.onload = t.step_func(() => {
+    addEventListener('load', t.step_func(() => {
       t.step_timeout(() => {
         t.done()
       }, 1500);
-    });
+    }));
   }, `<iframe sandbox="${sandboxValue}"> ${document.title}`);
 });
 </script>