1 files changed, 26 insertions, 18 deletions
diff --git a/testing/web-platform/tests/fenced-frame/csp-allowed.https.html b/testing/web-platform/tests/fenced-frame/csp-allowed.https.html
index 8c002bc8a9..4b2fadd59e 100644
--- a/testing/web-platform/tests/fenced-frame/csp-allowed.https.html
+++ b/testing/web-platform/tests/fenced-frame/csp-allowed.https.html
@@ -4,24 +4,31 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
 <script src="resources/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
 
 <body>
 <script>
-for (const resolve_to_config of [true, false]) {
-  const allowedCSPs = ["*", "https:", "https://*:*"];
-  allowedCSPs.forEach((csp) => {
+const allowedCSPs = [
+  "*",
+  "https:",
+  "https://*:*"
+];
+allowedCSPs.forEach((csp) => {
+  for (const resolve_to_config of [true, false]) {
     promise_test(async() => {
-      setupCSP(csp);
-
+      const iframe = setupCSP(csp);
       const key = token();
-      window.addEventListener('securitypolicyviolation', function(e) {
-        // Write to the server even though the listener is in the same file in
-        // the test below.
-        writeValueToServer(key, e.violatedDirective + ";" + e.blockedURI);
-      }, {once: true});
 
-      attachFencedFrame(await runSelectURL("resources/embeddee.html",
-                                  [key], resolve_to_config));
+      await iframe.execute(async (key, resolve_to_config) => {
+        window.addEventListener('securitypolicyviolation', function(e) {
+          // Write to the server even though the listener is in the same file in
+          // the test below.
+          writeValueToServer(key, e.violatedDirective + ";" + e.blockedURI);
+        }, {once: true});
+
+        attachFencedFrame(await runSelectURL(
+            "/fenced-frame/resources/embeddee.html", [key], resolve_to_config));
+      }, [key, resolve_to_config]);
 
       const result = await nextValueFromServer(key);
       assert_equals(result, "PASS",
@@ -29,12 +36,13 @@ for (const resolve_to_config of [true, false]) {
     }, "Fenced frame loaded for CSP fenced-frame-src " + csp + " using " +
          (resolve_to_config ? "config" : "urn:uuid"));
 
-    promise_test(async() => {
-      setupCSP(csp);
+  }
+  promise_test(async() => {
+    const iframe = setupCSP(csp);
+    await iframe.execute(() => {
       assert_true(navigator.canLoadAdAuctionFencedFrame());
-    }, "Opaque-ads can load API returns true for " + csp + " using " +
-       (resolve_to_config ? "config" : "urn:uuid"));
-  });
-}
+    });
+  }, "Opaque-ads can load API returns true for " + csp);
+});
 </script>
 </body>