Merging upstream version 126.0.

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

6 files changed, 8 insertions, 6 deletions

diff --git a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html
index 7af2b8944e..8ca1819df8 100644
--- a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html
+++ b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-disabled-by-feature-policy.tentative.https.sub.html
@@ -5,6 +5,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
+<script src="../../resources/user-activation.js"></script>
 <script>
 'use strict';
 
@@ -14,7 +15,7 @@ const cross_origin_src =
   'https://{{domains[www]}}:{{ports[https][0]}}' + same_origin_src;
 
 promise_test(async t => {
-  await test_driver.set_permission({ name: 'clipboard-read' }, 'granted');
+  await tryGrantReadPermission();
   return promise_rejects_dom(t, 'NotAllowedError',
       navigator.clipboard.readText('test text'));
 }, 'Feature-Policy header clipboard-read "none" disallows the top-level document.');
diff --git a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html
index 552183cc67..c21d6cf0f6 100644
--- a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html
+++ b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-by-feature-policy.tentative.https.sub.html
@@ -15,7 +15,7 @@ const cross_origin_src =
   'https://{{domains[www]}}:{{ports[https][0]}}' + same_origin_src;
 
 promise_test(async t => {
-  await test_driver.set_permission({ name: 'clipboard-read' }, 'granted');
+  await tryGrantReadPermission();
   await waitForUserActivation();
   await navigator.clipboard.readText('test text');
 }, 'Feature-Policy header clipboard-read "*" allows the top-level document.');
diff --git a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html
index 17dc3628a7..79dd6cf891 100644
--- a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html
+++ b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-read/clipboard-read-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html
@@ -15,7 +15,7 @@ const cross_origin_src =
   'https://{{domains[www]}}:{{ports[https][0]}}' + same_origin_src;
 
 promise_test(async t => {
-  await test_driver.set_permission({ name: 'clipboard-read' }, 'granted');
+  await tryGrantReadPermission();
   await waitForUserActivation();
   await navigator.clipboard.readText('test text');
 }, 'Feature-Policy header clipboard-read "self" allows the top-level document.');
diff --git a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html
index 5d19d8dd6f..b328debde2 100644
--- a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html
+++ b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-disabled-by-feature-policy.tentative.https.sub.html
@@ -5,6 +5,7 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 <script src="/feature-policy/resources/featurepolicy.js"></script>
+<script src="../../resources/user-activation.js"></script>
 <script>
 'use strict';
 
@@ -14,7 +15,7 @@ const cross_origin_src =
   'https://{{domains[www]}}:{{ports[https][0]}}' + same_origin_src;
 
 promise_test(async t => {
-  await test_driver.set_permission({ name: 'clipboard-write' }, 'granted');
+  await tryGrantWritePermission();
   return promise_rejects_dom(t, 'NotAllowedError',
       navigator.clipboard.writeText('test text'));
 }, 'Feature-Policy header clipboard-write "none" disallows the top-level document.');
diff --git a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html
index ca97994c61..cb908df65f 100644
--- a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html
+++ b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-by-feature-policy.tentative.https.sub.html
@@ -15,7 +15,7 @@ const cross_origin_src =
   'https://{{domains[www]}}:{{ports[https][0]}}' + same_origin_src;
 
 promise_test(async t => {
-  await test_driver.set_permission({ name: 'clipboard-write' }, 'granted');
+  await tryGrantWritePermission();
   await waitForUserActivation();
   await navigator.clipboard.writeText('test text');
 }, 'Feature-Policy header clipboard-write "*" allows the top-level document.');
diff --git a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html
index 5615a68ac5..532c72545c 100644
--- a/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html
+++ b/testing/web-platform/tests/clipboard-apis/feature-policy/clipboard-write/clipboard-write-enabled-on-self-origin-by-feature-policy.tentative.https.sub.html
@@ -15,7 +15,7 @@ const cross_origin_src =
   'https://{{domains[www]}}:{{ports[https][0]}}' + same_origin_src;
 
 promise_test(async t => {
-  await test_driver.set_permission({ name: 'clipboard-write' }, 'granted');
+  await tryGrantWritePermission();
   await waitForUserActivation();
   await navigator.clipboard.writeText('test text');
 }, 'Feature-Policy header clipboard-write "self" allows the top-level document.');