From 1dd6a5d98c6e763188ebf451d95e6b2299aed000 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 8 Jul 2019 08:47:30 +0000
Subject: [PATCH] Bug 1514296 - FeaturePolicy - WPT fixed, r=ckerschb

Differential Revision: https://phabricator.services.mozilla.com/D35803

--HG--
extra : moz-landing-system : lando
---
 ...orted-by-feature-policy.tentative.html.ini |   4 -
 ...led-violation-report-js-tentative.html.ini |   3 -
 ...lation-report-keyframes-tentative.html.ini |   4 -
 .../lazyload-enabled-tentative.sub.html.ini   |   1 -
 ...-propagation-to-auxiliary-context.html.ini |   2 +
 ...ndbox-policies-in-allow-attribute.html.ini |   3 +
 ...-policy-allowed-for-all.https.sub.html.ini | 235 -------------
 ...policy-allowed-for-self.https.sub.html.ini | 252 +-------------
 ...policy-allowed-for-some.https.sub.html.ini | 320 +-----------------
 ...licy-disallowed-for-all.https.sub.html.ini | 235 -------------
 ...-policy-allowed-for-all.https.sub.html.ini |  16 -
 ...policy-allowed-for-self.https.sub.html.ini |  16 -
 ...policy-allowed-for-some.https.sub.html.ini |  19 --
 ...-header-policy-declined.https.sub.html.ini |  22 --
 ...licy-disallowed-for-all.https.sub.html.ini |  16 -
 ...-policy-allowed-for-all.https.sub.html.ini |  19 --
 ...policy-allowed-for-self.https.sub.html.ini |  19 --
 ...licy-disallowed-for-all.https.sub.html.ini |  19 --
 .../feature-policy/idlharness.window.js.ini   |  31 --
 ...orted-by-feature-policy.tentative.html.ini |   3 -
 ...ensor-supported-by-feature-policy.html.ini |   4 -
 .../meta/geolocation-sensor/__dir__.ini       |   1 +
 ...oplay-supported-by-feature-policy.html.ini |   4 -
 ...tream-supported-by-feature-policy.html.ini |   7 -
 ...webvr-supported-by-feature-policy.html.ini |   4 -
 25 files changed, 10 insertions(+), 1249 deletions(-)
 delete mode 100644 testing/web-platform/meta/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.ini
 delete mode 100644 testing/web-platform/meta/feature-policy/idlharness.window.js.ini
 delete mode 100644 testing/web-platform/meta/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html.ini
 create mode 100644 testing/web-platform/meta/geolocation-sensor/__dir__.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html.ini
 delete mode 100644 testing/web-platform/meta/mediacapture-streams/MediaStream-supported-by-feature-policy.html.ini

diff --git a/testing/web-platform/meta/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html.ini b/testing/web-platform/meta/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html.ini
deleted file mode 100644
index 95961c01f4ab..000000000000
--- a/testing/web-platform/meta/encrypted-media/encrypted-media-supported-by-feature-policy.tentative.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[encrypted-media-supported-by-feature-policy.tentative.html]
-  [document.featurePolicy.features should advertise encrypted-media.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.ini b/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.ini
index 499f8eeb2149..5474dee81112 100644
--- a/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.ini
+++ b/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-js-tentative.html.ini
@@ -9,6 +9,3 @@
   [Verify that when 'layout-animations' is disabled, an 'element.animate' API including a keyframe that uses a blocked property generates violation report (inline scripts).]
     expected: NOTRUN
 
-  [Verify 'layout-animations' is not in document's feature list.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.ini b/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.ini
index 2517c9015cb0..d6790044f23f 100644
--- a/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.ini
+++ b/testing/web-platform/meta/feature-policy/experimental-features/layout-animations-disabled-violation-report-keyframes-tentative.html.ini
@@ -5,7 +5,3 @@
 
   [Verify that when 'layout-animations' is disabled, a keyframes which includes a blocked property generates violation report.]
     expected: TIMEOUT
-
-  [Sanity-check: 'layout-animations' is not in document's feature list.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini b/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini
index e017d8764522..176beffd095e 100644
--- a/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini
+++ b/testing/web-platform/meta/feature-policy/experimental-features/lazyload/lazyload-enabled-tentative.sub.html.ini
@@ -10,4 +10,3 @@
 
   [Sanity-check: Contents do not load immediately (no eager-loading) when the loading attribute is 'lazy' and frame is in viewport.]
     expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/feature-propagation-to-auxiliary-context.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/feature-propagation-to-auxiliary-context.html.ini
index 30b8aef716d8..b2f6c00f3da4 100644
--- a/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/feature-propagation-to-auxiliary-context.html.ini
+++ b/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/feature-propagation-to-auxiliary-context.html.ini
@@ -2,3 +2,5 @@
   [feature-propagation-to-auxiliary-context]
     expected: FAIL
 
+  [Verify feature policies are inherited by the auxiliary browsing context if opened from a non-sandboxed same-origin <iframe>.]
+    expected: FAIL
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/sandbox-policies-in-allow-attribute.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/sandbox-policies-in-allow-attribute.html.ini
index 99b4a6998e64..a2e863cf6491 100644
--- a/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/sandbox-policies-in-allow-attribute.html.ini
+++ b/testing/web-platform/meta/feature-policy/feature-policy-for-sandbox/sandbox-policies-in-allow-attribute.html.ini
@@ -2,3 +2,6 @@
   [sandbox-policies-in-allow-attribute]
     expected: FAIL
 
+  [Verify that when a sandbox related feature is enabled in 'allow' then  the feature will be enabled regardless of sandbox attribute's value.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.ini
deleted file mode 100644
index 39f653ec4c1c..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html.ini
+++ /dev/null
@@ -1,235 +0,0 @@
-[feature-policy-frame-policy-allowed-for-all.https.sub.html]
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc+ same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc+ cross origin iframe inherit from header policy.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.ini
index ce9a1e3f6d02..ab9e0702354c 100644
--- a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.ini
+++ b/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html.ini
@@ -1,259 +1,13 @@
 [feature-policy-frame-policy-allowed-for-self.https.sub.html]
-  [Test frame policy on sandboxed iframe with allow="fullscreen https://www.web-platform.test:8443".]
-    expected: FAIL
 
   [Test frame policy on sandboxed iframe with no allow attribute.]
     expected: FAIL
 
+  [Test frame policy on sandboxed iframe with allow="fullscreen https://www.web-platform.test:8443".]
+    expected: FAIL
+
   [Test frame policy on data: URL origin iframe with allow = "*".]
     expected: FAIL
 
   [Test frame policy on data: URL origin iframe with allow = "*" and allowfullscreen.]
     expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin sandboxed iframe with allow="fullscreen".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on sandboxed srcdoc iframe with allow="fullscreen https://www.web-platform.test:8443".]
-    expected: FAIL
-
-  [Test frame policy on sandboxed iframe with allow="fullscreen".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on sandboxed iframe with allow="fullscreen 'src'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc sandboxed iframe with allow="fullscreen".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin sandboxed iframe with allow="fullscreen".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on data: URL origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.ini
index 7ba77d8c2d94..80826d27ff46 100644
--- a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.ini
+++ b/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html.ini
@@ -1,325 +1,7 @@
 [feature-policy-frame-policy-allowed-for-some.https.sub.html]
+
   [Test frame policy on data: URL cross origin iframe with allow = "*".]
     expected: FAIL
 
   [Test frame policy on data: URL cross origin iframe with allow = "*" and allowfullscreen.]
     expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on another cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + another cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.ini
deleted file mode 100644
index 43d74e439077..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-frame-policy-disallowed-for-all.https.sub.html.ini
+++ /dev/null
@@ -1,235 +0,0 @@
-[feature-policy-frame-policy-disallowed-for-all.https.sub.html]
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'none'".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'none';".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe with allow = "*" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'none'" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + cross origin iframe inherit from header policy.]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and header policy = "Feature-Policy: fullscreen *;".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "'self' https://www.web-platform.test:8443 https://www.example.com" and allowfullscreen.]
-    expected: FAIL
-
-  [Test frame policy on srcdoc + same origin iframe with allow = "'self'".]
-    expected: FAIL
-
-  [Test frame policy on data: URL cross origin iframe with allow = "*".]
-    expected: FAIL
-
-  [Test frame policy on same origin iframe with allow = "*" and header policy = "Feature-Policy: fullscreen 'self';".]
-    expected: FAIL
-
-  [Test frame policy on cross origin iframe with allow = "'self'".]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.ini
deleted file mode 100644
index 5bbea0b45243..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[feature-policy-header-policy-allowed-for-all.https.sub.html]
-  [Feature-Policy: fullscreen * -- test fullscreen is allowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen * -- test fullscreen is allowed on cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen *, iframe.allow = fullscreen 'self'; -- test fullscreen is disallowed on cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen *, iframe.allow = fullscreen 'self'; -- test fullscreen is allowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen *NaN]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.ini
deleted file mode 100644
index cca74f9e232a..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-self.https.sub.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[feature-policy-header-policy-allowed-for-self.https.sub.html]
-  [Feature-Policy: fullscreen 'self' -- test allowlist is [same_origin\]]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self', iframe.allow = fullscreen 'src'; -- test fullscreen is allowed on cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self', iframe.allow = fullscreen 'src'; -- test fullscreen is allowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' -- test fullscreen is disallowed on cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' -- test fullscreen is allowed on same-origin subframe]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.ini
deleted file mode 100644
index c3844dacd636..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[feature-policy-header-policy-allowed-for-some.https.sub.html]
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com;, iframe.allow = fullscreen 'none'; -- test fullscreen is disallowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test fullscreen is disallowed on cross-origin https://www1.web-platform.test:8443/feature-policy/resources/feature-policy-allowedfeatures.html subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test allowlist is [same_origin, cross_origin, https://www.example.com\]]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test fullscreen is allowed on cross-origin https://www.web-platform.test:8443/feature-policy/resources/feature-policy-allowedfeatures.html subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test fullscreen is allowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com;iframe.allow = fullscreen 'none'; -- test fullscreen is disallowed on cross-origin subframe]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-declined.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-header-policy-declined.https.sub.html.ini
index a23305e77db2..db43442dd5d8 100644
--- a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-declined.https.sub.html.ini
+++ b/testing/web-platform/meta/feature-policy/feature-policy-header-policy-declined.https.sub.html.ini
@@ -1,25 +1,3 @@
 [feature-policy-header-policy-declined.https.sub.html]
   [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test allowlist is [cross_origin, https://www.example.com\]]
     expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com;, iframe.allow = fullscreen https://www.web-platform.test:8443 -- test fullscreen is disallowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com;, iframe.allow = fullscreen 'none'; -- test fullscreen is disallowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test fullscreen is disallowed on cross-origin https://www1.web-platform.test:8443/feature-policy/resources/feature-policy-allowedfeatures.html subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com;iframe.allow = fullscreen https://www.web-platform.test:8443 -- test fullscreen is allowed on specific cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com;iframe.allow = fullscreen 'none'; -- test fullscreen is allowed on specific cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test fullscreen is allowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'self' https://www.web-platform.test:8443 https://www.example.com; -- test fullscreen is allowed on cross-origin https://www.web-platform.test:8443/feature-policy/resources/feature-policy-allowedfeatures.html subframe]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.ini
deleted file mode 100644
index 0acffc506b47..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[feature-policy-header-policy-disallowed-for-all.https.sub.html]
-  [Feature-Policy: fullscreen 'none' -- test fullscreen is disallowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'none' -- test allowlist is [\]]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'none', iframe.allow = fullscreen 'src'; -- test fullscreen is disallowed on cross-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'none', iframe.allow = fullscreen 'src'; -- test fullscreen is disallowed on same-origin subframe]
-    expected: FAIL
-
-  [Feature-Policy: fullscreen 'none' -- test fullscreen is disallowed on cross-origin subframe]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.ini
deleted file mode 100644
index 0d0b744764b8..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[feature-policy-nested-header-policy-allowed-for-all.https.sub.html]
-  [Test nested header policy with remote iframe on policy "fullscreen *"]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen *"]
-    expected: FAIL
-
-  [Test nested header policy with remote iframe on policy "fullscreen 'self'"]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen 'self'"]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen 'none'"]
-    expected: FAIL
-
-  [Test nested header policy with remote iframe on policy "fullscreen 'none'"]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.ini
deleted file mode 100644
index d5d938c1b355..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[feature-policy-nested-header-policy-allowed-for-self.https.sub.html]
-  [Test nested header policy with remote iframe on policy "fullscreen *"]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen *"]
-    expected: FAIL
-
-  [Test nested header policy with remote iframe on policy "fullscreen 'self'"]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen 'self'"]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen 'none'"]
-    expected: FAIL
-
-  [Test nested header policy with remote iframe on policy "fullscreen 'none'"]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.ini b/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.ini
deleted file mode 100644
index 147ffd111edf..000000000000
--- a/testing/web-platform/meta/feature-policy/feature-policy-nested-header-policy-disallowed-for-all.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[feature-policy-nested-header-policy-disallowed-for-all.https.sub.html]
-  [Test nested header policy with remote iframe on policy "fullscreen 'self'".]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen 'self'".]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen *".]
-    expected: FAIL
-
-  [Test nested header policy with local iframe on policy "fullscreen 'none'".]
-    expected: FAIL
-
-  [Test nested header policy with remote iframe on policy "fullscreen 'none'".]
-    expected: FAIL
-
-  [Test nested header policy with remote iframe on policy "fullscreen *".]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/idlharness.window.js.ini b/testing/web-platform/meta/feature-policy/idlharness.window.js.ini
deleted file mode 100644
index 4c2325d05a6d..000000000000
--- a/testing/web-platform/meta/feature-policy/idlharness.window.js.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-[idlharness.window.html]
-  [HTMLIFrameElement interface: attribute featurePolicy]
-    expected: FAIL
-
-  [Document interface: attribute featurePolicy]
-    expected: FAIL
-
-  [Document interface: document must inherit property "featurePolicy" with the proper type]
-    expected: FAIL
-
-  [FeaturePolicy interface: document.featurePolicy must inherit property "allowsFeature(DOMString, DOMString)" with the proper type]
-    expected: FAIL
-
-  [FeaturePolicy interface: document.featurePolicy must inherit property "getAllowlistForFeature(DOMString)" with the proper type]
-    expected: FAIL
-
-  [FeaturePolicy interface: document.featurePolicy must inherit property "allowedFeatures()" with the proper type]
-    expected: FAIL
-
-  [FeaturePolicy interface: calling getAllowlistForFeature(DOMString) on document.featurePolicy with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [Stringification of document.featurePolicy]
-    expected: FAIL
-
-  [FeaturePolicy interface: calling allowsFeature(DOMString, DOMString) on document.featurePolicy with too few arguments must throw TypeError]
-    expected: FAIL
-
-  [FeaturePolicy interface: document.featurePolicy must inherit property "features()" with the proper type]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/feature-policy/payment-supported-by-feature-policy.tentative.html.ini b/testing/web-platform/meta/feature-policy/payment-supported-by-feature-policy.tentative.html.ini
index 5f8181b6baf0..59017c636a2d 100644
--- a/testing/web-platform/meta/feature-policy/payment-supported-by-feature-policy.tentative.html.ini
+++ b/testing/web-platform/meta/feature-policy/payment-supported-by-feature-policy.tentative.html.ini
@@ -1,6 +1,3 @@
 [payment-supported-by-feature-policy.tentative.html]
   disabled:
     if (os == "android") or not nightly_build: https://bugzilla.mozilla.org/show_bug.cgi?id=1549241
-  [document.featurePolicy.features should advertise payment.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html.ini b/testing/web-platform/meta/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html.ini
deleted file mode 100644
index d4d1b0b56e5b..000000000000
--- a/testing/web-platform/meta/geolocation-sensor/GeolocationSensor-supported-by-feature-policy.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[GeolocationSensor-supported-by-feature-policy.html]
-  [document.featurePolicy.features should advertise geolocation.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/geolocation-sensor/__dir__.ini b/testing/web-platform/meta/geolocation-sensor/__dir__.ini
new file mode 100644
index 000000000000..22193ef6f8a8
--- /dev/null
+++ b/testing/web-platform/meta/geolocation-sensor/__dir__.ini
@@ -0,0 +1 @@
+prefs: [dom.security.featurePolicy.enabled:true, dom.reporting.enabled:true, dom.reporting.featurePolicy.enabled:true, dom.security.featurePolicy.header.enabled:true, dom.security.featurePolicy.webidl.enabled:true]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html.ini
deleted file mode 100644
index 41e9161e0c22..000000000000
--- a/testing/web-platform/meta/html/semantics/embedded-content/media-elements/autoplay-supported-by-feature-policy.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[autoplay-supported-by-feature-policy.html]
-  [document.featurePolicy.features should advertise autoplay.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/mediacapture-streams/MediaStream-supported-by-feature-policy.html.ini b/testing/web-platform/meta/mediacapture-streams/MediaStream-supported-by-feature-policy.html.ini
deleted file mode 100644
index ce475a2b1413..000000000000
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-supported-by-feature-policy.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[MediaStream-supported-by-feature-policy.html]
-  [document.featurePolicy.features should advertise microphone.]
-    expected: FAIL
-
-  [document.featurePolicy.features should advertise camera.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/webvr/webvr-supported-by-feature-policy.html.ini b/testing/web-platform/meta/webvr/webvr-supported-by-feature-policy.html.ini
index 72ebd885e435..b3b446543fe7 100644
--- a/testing/web-platform/meta/webvr/webvr-supported-by-feature-policy.html.ini
+++ b/testing/web-platform/meta/webvr/webvr-supported-by-feature-policy.html.ini
@@ -1,7 +1,3 @@
 [webvr-supported-by-feature-policy.html]
   [document.featurePolicy.features should advertise xr.]
     expected: FAIL
-
-  [document.featurePolicy.features should advertise (obsolete) vr.]
-    expected: FAIL
-