From 7655735b1985796b6646030524354abf12d09fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Beaufort?= <beaufort.francois@gmail.com>
Date: Tue, 16 Oct 2018 09:58:35 +0000
Subject: [PATCH] Bug 1498667 [wpt PR 13484] - [Picture-in-Picture] Bail early
 for feature policy tests, a=testonly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Automatic update from web-platform-tests[Picture-in-Picture] Bail early for feature policy tests

Change-Id: I0186fd20fc1d1e763208f5488917b65d24fa3e00
Reviewed-on: https://chromium-review.googlesource.com/c/1278786
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Cr-Commit-Position: refs/heads/master@{#599253}

--

wpt-commits: 433fc8986e3dbad91f7d3e3fe0271488ba146504
wpt-pr: 13484
---
 ...cy-attribute-redirect-on-load.https.sub.html |  4 ++--
 ...d-by-feature-policy-attribute.https.sub.html |  4 ++--
 ...ure-allowed-by-feature-policy.https.sub.html |  6 +++---
 ...icture-default-feature-policy.https.sub.html |  6 +++---
 ...re-disabled-by-feature-policy.https.sub.html |  6 +++---
 .../reporting/picture-in-picture-reporting.html |  3 ++-
 .../resources/picture-in-picture.js             | 17 ++++++++++++++---
 7 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html b/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html
index e2b52f257a12..a5ea5139a937 100644
--- a/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html
+++ b/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html
@@ -16,13 +16,13 @@
     relative_path;
   const header = 'Feature-Policy allow="picture-in-picture"';
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability(
         'picture-in-picture', t, same_origin_src,
         expect_feature_available_default, 'picture-in-picture');
   }, header + ' allows same-origin navigation in an iframe.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability(
         'picture-in-picture', t, cross_origin_src,
         expect_feature_unavailable_default, 'picture-in-picture');
diff --git a/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html b/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html
index 0c3897a4ad0f..b0e160e938d3 100644
--- a/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html
+++ b/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy-attribute.https.sub.html
@@ -15,13 +15,13 @@
   const feature_name = 'Feature policy "picture-in-picture"';
   const header = 'allow="picture-in-picture" attribute';
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability(
         'picture-in-picture', t, same_origin_src,
         expect_feature_available_default, 'picture-in-picture');
   }, feature_name + ' can be enabled in same-origin iframe using ' + header);
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability(
         'picture-in-picture', t, cross_origin_src,
         expect_feature_available_default, 'picture-in-picture');
diff --git a/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html b/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html
index 1ecd874c009a..b09335a6de38 100644
--- a/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html
+++ b/testing/web-platform/tests/feature-policy/picture-in-picture-allowed-by-feature-policy.https.sub.html
@@ -14,18 +14,18 @@
     same_origin_src;
   const header = 'Feature-Policy header: picture-in-picture *';
 
-  async_test(t => {
+  async_pip_test(t => {
     isPictureInPictureAllowed().then(t.step_func_done((result) => {
       assert_true(result);
     }));
   }, header + ' allows the top-level document.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability('picture-in-picture', t, same_origin_src,
         expect_feature_available_default);
   }, header + ' allows same-origin iframes.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability('picture-in-picture', t, cross_origin_src,
         expect_feature_available_default);
   }, header + ' allows cross-origin iframes.');
diff --git a/testing/web-platform/tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html b/testing/web-platform/tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html
index 12bbf7f2f1f8..477cf7ba51db 100644
--- a/testing/web-platform/tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html
+++ b/testing/web-platform/tests/feature-policy/picture-in-picture-default-feature-policy.https.sub.html
@@ -14,18 +14,18 @@
     same_origin_src;
   const header = 'Default "picture-in-picture" feature policy [*]';
 
-  async_test(t => {
+  async_pip_test(t => {
     isPictureInPictureAllowed().then(t.step_func_done((result) => {
       assert_true(result);
     }));
   }, header + ' allows the top-level document.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability('picture-in-picture', t, same_origin_src,
         expect_feature_available_default);
   }, header + ' allows same-origin iframes.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability('picture-in-picture', t, cross_origin_src,
         expect_feature_available_default);
   }, header + ' allows cross-origin iframes.');
diff --git a/testing/web-platform/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html b/testing/web-platform/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html
index b36afbda503f..513d04c2fa91 100644
--- a/testing/web-platform/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html
+++ b/testing/web-platform/tests/feature-policy/picture-in-picture-disabled-by-feature-policy.https.sub.html
@@ -14,18 +14,18 @@
     same_origin_src;
   const header = 'Feature-Policy header: picture-in-picture "none"';
 
-  async_test(t => {
+  async_pip_test(t => {
     isPictureInPictureAllowed().then(t.step_func_done((result) => {
       assert_false(result);
     }));
   }, header + ' disallows the top-level document.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability('picture-in-picture', t, same_origin_src,
         expect_feature_unavailable_default);
   }, header + ' disallows same-origin iframes.');
 
-  async_test(t => {
+  async_pip_test(t => {
     test_feature_availability('picture-in-picture', t, cross_origin_src,
         expect_feature_unavailable_default);
   }, header + ' disallows cross-origin iframes.');
diff --git a/testing/web-platform/tests/feature-policy/reporting/picture-in-picture-reporting.html b/testing/web-platform/tests/feature-policy/reporting/picture-in-picture-reporting.html
index 60e4825d9882..e3cbf1036871 100644
--- a/testing/web-platform/tests/feature-policy/reporting/picture-in-picture-reporting.html
+++ b/testing/web-platform/tests/feature-policy/reporting/picture-in-picture-reporting.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/picture-in-picture.js'></script>
   </head>
   <body>
     <script>
@@ -28,7 +29,7 @@ const loadVideo = () => new Promise(resolve => {
     }, { once: true });
 });
 
-promise_test(async (t) => {
+promise_pip_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
                           {types: ['feature-policy']}).observe();
diff --git a/testing/web-platform/tests/feature-policy/resources/picture-in-picture.js b/testing/web-platform/tests/feature-policy/resources/picture-in-picture.js
index e245d798acfc..1bf3c1c12a8a 100644
--- a/testing/web-platform/tests/feature-policy/resources/picture-in-picture.js
+++ b/testing/web-platform/tests/feature-policy/resources/picture-in-picture.js
@@ -1,7 +1,18 @@
-function isPictureInPictureAllowed() {
-  if (!('pictureInPictureEnabled' in document))
-    return Promise.resolve(false);
+function async_pip_test(func, name) {
+  async_test(t => {
+    assert_true('pictureInPictureEnabled' in document, 'Picture-in-Picture API is available');
+    func(t);
+  }, name);
+}
 
+function promise_pip_test(func, name) {
+  promise_test(async t => {
+    assert_true('pictureInPictureEnabled' in document, 'Picture-in-Picture API is available');
+    return func(t);
+  }, name);
+}
+
+function isPictureInPictureAllowed() {
   return new Promise(resolve => {
     let video = document.createElement('video');
     video.src = getVideoURI('/media/movie_5');