diff --git a/dom/permission/tests/test_permissions_api.html b/dom/permission/tests/test_permissions_api.html index c936b46e91a..5cced3597af 100644 --- a/dom/permission/tests/test_permissions_api.html +++ b/dom/permission/tests/test_permissions_api.html @@ -31,14 +31,6 @@ const UNSUPPORTED_PERMISSIONS = [ 'midi' ]; -function setup() { - return new Promise((resolve, reject) => { - SpecialPowers.pushPrefEnv({'set': [ - ['dom.permissions.enabled', true], - ]}, resolve); - }); -} - function setPermissions(action) { let permissions = PERMISSIONS.map(x => { return { 'type': x.perm, 'allow': action, 'context': document }; @@ -111,8 +103,7 @@ function testInvalidQuery() { } function runTests() { - setup() - .then(checkUnsupportedPermissions) + checkUnsupportedPermissions() .then(checkUserVisiblePushPermission) .then(() => setPermissions(UNKNOWN_ACTION)) .then(() => checkPermissions('prompt')) diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl index cb08be68149..74ee74909e5 100644 --- a/dom/webidl/Navigator.webidl +++ b/dom/webidl/Navigator.webidl @@ -100,7 +100,7 @@ interface NavigatorFeatures { }; partial interface Navigator { - [Throws, Pref="dom.permissions.enabled"] + [Throws] readonly attribute Permissions permissions; }; diff --git a/dom/webidl/PermissionStatus.webidl b/dom/webidl/PermissionStatus.webidl index 27ae490c391..3abfd66f407 100644 --- a/dom/webidl/PermissionStatus.webidl +++ b/dom/webidl/PermissionStatus.webidl @@ -13,8 +13,7 @@ enum PermissionState { "prompt" }; -[Exposed=(Window), - Pref="dom.permissions.enabled"] +[Exposed=(Window)] interface PermissionStatus : EventTarget { readonly attribute PermissionState state; attribute EventHandler onchange; diff --git a/dom/webidl/Permissions.webidl b/dom/webidl/Permissions.webidl index 776a22ff843..17574c75e59 100644 --- a/dom/webidl/Permissions.webidl +++ b/dom/webidl/Permissions.webidl @@ -22,8 +22,7 @@ dictionary PushPermissionDescriptor : PermissionDescriptor { boolean userVisible = false; }; -[Exposed=(Window), - Pref="dom.permissions.enabled"] +[Exposed=(Window)] interface Permissions { [Throws] Promise query(object permission); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index e09bbb2e223..d513194bff5 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -129,9 +129,6 @@ pref("dom.indexedDB.logging.profiler-marks", false); // Whether or not File Handle is enabled. pref("dom.fileHandle.enabled", true); -// Whether or not the Permissions API is enabled. -pref("dom.permissions.enabled", true); - // Whether or not selection events are enabled #ifdef NIGHTLY_BUILD pref("dom.select_events.enabled", true);