Bug 1497486 - Enable FeaturePolicy in nightly, r=ckerschb
authorAndrea Marchesini <amarchesini@mozilla.com>
Tue, 16 Oct 2018 07:58:00 +0200
changeset 489715 4700f0a79ebd4ec48932225cc7c124c999656938
parent 489714 90b73f4b4635a692c5528a0703b0e9bb5355caac
child 489716 847c7c6af1db86f0edcae2986a9a9582160f4f4b
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersckerschb
bugs1497486
milestone64.0a1
Bug 1497486 - Enable FeaturePolicy in nightly, r=ckerschb
modules/libpref/init/StaticPrefList.h
testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1740,19 +1740,25 @@ VARCACHE_PREF(
    devtools_enabled,
   RelaxedAtomicBool, false
 )
 
 //---------------------------------------------------------------------------
 // Feature-Policy prefs
 //---------------------------------------------------------------------------
 
+#ifdef NIGHTLY_BUILD
+# define PREF_VALUE true
+#else
+# define PREF_VALUE false
+#endif
 VARCACHE_PREF(
   "dom.security.featurePolicy.enabled",
    dom_security_featurePolicy_enabled,
-  bool, false
+  bool, PREF_VALUE
 )
+#undef PREF_VALUE
 
 //---------------------------------------------------------------------------
 // End of prefs
 //---------------------------------------------------------------------------
 
 // clang-format on
--- a/testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
+++ b/testing/web-platform/meta/wake-lock/wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
@@ -1,7 +1,4 @@
 [wakelock-enabled-by-feature-policy-attribute-redirect-on-load.https.sub.html]
   [Feature-Policy allow="wake-lock" allows same-origin relocation]
     expected: FAIL
 
-  [Feature-Policy allow="wake-lock" disallows cross-origin relocation]
-    expected: FAIL
-
--- a/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
+++ b/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html.ini
@@ -1,13 +1,11 @@
 [usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html]
+  expected: TIMEOUT
   [Feature-Policy allow="usb" allows same-origin relocation.]
     expected: FAIL
 
-  [Feature-Policy allow="usb" disallows cross-origin relocation.]
-    expected: FAIL
-
   [Feature-Policy allow="usb" allows workers in same-origin relocation.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Feature-Policy allow="usb" disallows workers in cross-origin relocation.]
-    expected: FAIL
+    expected: TIMEOUT
 
--- a/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini
+++ b/testing/web-platform/meta/webusb/usb-allowed-by-feature-policy-attribute.https.sub.html.ini
@@ -1,19 +1,20 @@
 [usb-allowed-by-feature-policy-attribute.https.sub.html]
+  expected: TIMEOUT
   [Feature policy "usb" can be enabled in cross-origin iframes using "allowed" attribute.]
     expected: FAIL
 
   [Feature policy "usb" can be enabled in same-origin iframe using allow="usb" attribute]
     expected: FAIL
 
   [Feature policy "usb" can be enabled in cross-origin iframe using allow="usb" attribute]
     expected: FAIL
 
   [Feature policy "usb" can be enabled in a worker in same-origin iframe using allow="usb" attribute]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Feature policy "usb" can be enabled in a worker in cross-origin iframe using allow="usb" attribute]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Inherited header feature policy allows dedicated workers.]
     expected: FAIL