Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 10 insertions, 8 deletions

diff --git a/testing/web-platform/tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html b/testing/web-platform/tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html
index 8e8e015aa0..827c17a9e3 100644
--- a/testing/web-platform/tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html
+++ b/testing/web-platform/tests/clipboard-apis/detached-iframe/read-on-detaching-iframe.https.html
@@ -6,6 +6,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="../resources/user-activation.js"></script>
 <iframe id="iframe"></iframe>
 <script>
 'use strict';
@@ -14,8 +15,8 @@ promise_test(async t => {
   // This tests proper behavior on a detaching iframe. text/plain is chosen for
   // simplicity, and the test should fail the same way no matter what the input
   // type is.
-  await test_driver.set_permission({name: 'clipboard-read'}, 'granted');
-  await test_driver.set_permission({name: 'clipboard-write'}, 'granted');
+  await tryGrantReadPermission();
+  await tryGrantWritePermission();
 
   const iframe = document.getElementById('iframe');
   const iframeClipboard = iframe.contentWindow.navigator.clipboard;
diff --git a/testing/web-platform/tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html b/testing/web-platform/tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html
index c6913d9e9f..b3836799df 100644
--- a/testing/web-platform/tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html
+++ b/testing/web-platform/tests/clipboard-apis/detached-iframe/write-on-detaching-iframe.https.html
@@ -6,6 +6,7 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="../resources/user-activation.js"></script>
 <iframe id="iframe"></iframe>
 <script>
 'use strict';
@@ -14,8 +15,8 @@ promise_test(async t => {
   // This tests proper behavior on a detaching iframe. text/plain is chosen for
   // simplicity, and the test should fail the same way no matter what the input
   // type is.
-  await test_driver.set_permission({name: 'clipboard-read'}, 'granted');
-  await test_driver.set_permission({name: 'clipboard-write'}, 'granted');
+  await tryGrantReadPermission();
+  await tryGrantWritePermission();
 
   const iframe = document.getElementById('iframe');
   const iframeClipboard = iframe.contentWindow.navigator.clipboard;
diff --git a/testing/web-platform/tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html b/testing/web-platform/tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html
index b21e6b20bc..155f9d004a 100644
--- a/testing/web-platform/tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html
+++ b/testing/web-platform/tests/clipboard-apis/detached-iframe/write-read-on-detached-iframe.https.html
@@ -15,8 +15,8 @@ promise_test(async t => {
   // This tests proper behavior on a detaching iframe. text/plain is chosen for
   // simplicity, and the test should fail the same way no matter what the input
   // type is.
-  await test_driver.set_permission({name: 'clipboard-read'}, 'granted');
-  await test_driver.set_permission({name: 'clipboard-write'}, 'granted');
+  await tryGrantReadPermission();
+  await tryGrantWritePermission();
 
   const iframe = document.getElementById('iframe');
   const iframeClipboard = iframe.contentWindow.navigator.clipboard;
diff --git a/testing/web-platform/tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html b/testing/web-platform/tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html
index 24fa586fc7..8c6448d5cc 100644
--- a/testing/web-platform/tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html
+++ b/testing/web-platform/tests/clipboard-apis/detached-iframe/writeText-readText-on-detached-iframe.https.html
@@ -12,8 +12,8 @@
 'use strict';
 
 promise_test(async t => {
-  await test_driver.set_permission({name: 'clipboard-read'}, 'granted');
-  await test_driver.set_permission({name: 'clipboard-write'}, 'granted');
+  await tryGrantReadPermission();
+  await tryGrantWritePermission();
 
   const iframe = document.getElementById('iframe');
   await waitForUserActivation();