diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index 855d578f908..845e31af341 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -437,9 +437,6 @@ pref("dom.phonenumber.substringmatching.VE", 7); pref("dom.phonenumber.substringmatching.CL", 8); pref("dom.phonenumber.substringmatching.PE", 7); -// WebAlarms -pref("dom.mozAlarms.enabled", true); - // SimplePush pref("services.push.enabled", true); // Debugging enabled. diff --git a/dom/alarm/test/test_alarm_add_data.html b/dom/alarm/test/test_alarm_add_data.html index 5d5c5544443..ef18d3a3524 100644 --- a/dom/alarm/test/test_alarm_add_data.html +++ b/dom/alarm/test/test_alarm_add_data.html @@ -199,35 +199,31 @@ } function startTests() { - SpecialPowers.pushPrefEnv({ - "set": [["dom.mozAlarms.enabled", true]] - }, function() { - var isAllowedToTest = true; + var isAllowedToTest = true; - if (navigator.appVersion.indexOf("Android") !== -1) { - ok(true, "mozAlarms is not allowed on Android for now. " + - "TODO Bug 863557."); - isAllowedToTest = false; - } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == - SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { - ok(true, "mozAlarms is not allowed for non-installed apps. " + - "TODO Bug 876981."); - isAllowedToTest = false; + if (navigator.appVersion.indexOf("Android") !== -1) { + ok(true, "mozAlarms is not allowed on Android for now. " + + "TODO Bug 863557."); + isAllowedToTest = false; + } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == + SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { + ok(true, "mozAlarms is not allowed for non-installed apps. " + + "TODO Bug 876981."); + isAllowedToTest = false; + } + + if (isAllowedToTest) { + ok(true, "Start to test..."); + testEmptyObject(); + } else { + // A sanity check to make sure we must run tests on Firefox OS (B2G). + if (navigator.userAgent.indexOf("Mobile") != -1 && + navigator.appVersion.indexOf("Android") == -1) { + ok(false, "Should run the test on Firefox OS (B2G)!"); } - if (isAllowedToTest) { - ok(true, "Start to test..."); - testEmptyObject(); - } else { - // A sanity check to make sure we must run tests on Firefox OS (B2G). - if (navigator.userAgent.indexOf("Mobile") != -1 && - navigator.appVersion.indexOf("Android") == -1) { - ok(false, "Should run the test on Firefox OS (B2G)!"); - } - - SimpleTest.finish(); - } - }); + SimpleTest.finish(); + } } SimpleTest.expectAssertions(0, 9); diff --git a/dom/alarm/test/test_alarm_add_date.html b/dom/alarm/test/test_alarm_add_date.html index 5c0e87a6d37..09b6497ba83 100644 --- a/dom/alarm/test/test_alarm_add_date.html +++ b/dom/alarm/test/test_alarm_add_date.html @@ -99,35 +99,31 @@ } function startTests() { - SpecialPowers.pushPrefEnv({ - "set": [["dom.mozAlarms.enabled", true]] - }, function() { - var isAllowedToTest = true; + var isAllowedToTest = true; - if (navigator.appVersion.indexOf("Android") !== -1) { - ok(true, "mozAlarms is not allowed on Android for now. " + - "TODO Bug 863557."); - isAllowedToTest = false; - } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == - SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { - ok(true, "mozAlarms is not allowed for non-installed apps. " + - "TODO Bug 876981."); - isAllowedToTest = false; + if (navigator.appVersion.indexOf("Android") !== -1) { + ok(true, "mozAlarms is not allowed on Android for now. " + + "TODO Bug 863557."); + isAllowedToTest = false; + } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == + SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { + ok(true, "mozAlarms is not allowed for non-installed apps. " + + "TODO Bug 876981."); + isAllowedToTest = false; + } + + if (isAllowedToTest) { + ok(true, "Start to test..."); + testFutureDate(); + } else { + // A sanity check to make sure we must run tests on Firefox OS (B2G). + if (navigator.userAgent.indexOf("Mobile") != -1 && + navigator.appVersion.indexOf("Android") == -1) { + ok(false, "Should run the test on Firefox OS (B2G)!"); } - if (isAllowedToTest) { - ok(true, "Start to test..."); - testFutureDate(); - } else { - // A sanity check to make sure we must run tests on Firefox OS (B2G). - if (navigator.userAgent.indexOf("Mobile") != -1 && - navigator.appVersion.indexOf("Android") == -1) { - ok(false, "Should run the test on Firefox OS (B2G)!"); - } - - SimpleTest.finish(); - } - }); + SimpleTest.finish(); + } } SimpleTest.expectAssertions(0, 9); diff --git a/dom/alarm/test/test_alarm_add_respectTimezone.html b/dom/alarm/test/test_alarm_add_respectTimezone.html index 1b533cbd773..2aa981836f2 100644 --- a/dom/alarm/test/test_alarm_add_respectTimezone.html +++ b/dom/alarm/test/test_alarm_add_respectTimezone.html @@ -117,41 +117,37 @@ } function startTests() { - SpecialPowers.pushPrefEnv({ - "set": [["dom.mozAlarms.enabled", true]] - }, function() { - var isAllowedToTest = true; + var isAllowedToTest = true; - if (navigator.appVersion.indexOf("Android") !== -1) { - ok(true, "mozAlarms is not allowed on Android for now. " + - "TODO Bug 863557."); - isAllowedToTest = false; - } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == - SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { - ok(true, "mozAlarms is not allowed for non-installed apps. " + - "TODO Bug 876981."); - isAllowedToTest = false; + if (navigator.appVersion.indexOf("Android") !== -1) { + ok(true, "mozAlarms is not allowed on Android for now. " + + "TODO Bug 863557."); + isAllowedToTest = false; + } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == + SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { + ok(true, "mozAlarms is not allowed for non-installed apps. " + + "TODO Bug 876981."); + isAllowedToTest = false; + } + + if (isAllowedToTest) { + ok(true, "Start to test..."); + + // Arbitrary date to use for tests + var tomorrow = new Date(); + tomorrow.setDate(tomorrow.getDate() + 1); + + // Kick off the tests + testHonorTimezone(tomorrow); + } else { + // A sanity check to make sure we must run tests on Firefox OS (B2G). + if (navigator.userAgent.indexOf("Mobile") != -1 && + navigator.appVersion.indexOf("Android") == -1) { + ok(false, "Should run the test on Firefox OS (B2G)!"); } - if (isAllowedToTest) { - ok(true, "Start to test..."); - - // Arbitrary date to use for tests - var tomorrow = new Date(); - tomorrow.setDate(tomorrow.getDate() + 1); - - // Kick off the tests - testHonorTimezone(tomorrow); - } else { - // A sanity check to make sure we must run tests on Firefox OS (B2G). - if (navigator.userAgent.indexOf("Mobile") != -1 && - navigator.appVersion.indexOf("Android") == -1) { - ok(false, "Should run the test on Firefox OS (B2G)!"); - } - - SimpleTest.finish(); - } - }); + SimpleTest.finish(); + } } SimpleTest.expectAssertions(0, 9); diff --git a/dom/alarm/test/test_alarm_non_permitted_app.html b/dom/alarm/test/test_alarm_non_permitted_app.html index 3ca447bf2af..bcc678de697 100644 --- a/dom/alarm/test/test_alarm_non_permitted_app.html +++ b/dom/alarm/test/test_alarm_non_permitted_app.html @@ -13,29 +13,24 @@ "use strict"; -SimpleTest.waitForExplicitFinish(); if (SpecialPowers.hasPermission("alarms", document)) { SpecialPowers.removePermission("alarms", document); window.location.reload(); } else { - SpecialPowers.pushPrefEnv({"set": [["dom.mozAlarms.enabled", true]]}, function() { - SpecialPowers.removePermission("alarms", document); - - // mozAlarms is installed on all platforms except Android for the moment. - if (navigator.appVersion.indexOf("Android") != -1) { - ok(!('mozAlarms' in navigator), - "navigator.mozAlarms should not exist without permission"); - ok(!('AlarmsManager' in window), - "Interface AlarmsManager should not exist"); - } else { - ok(!('mozAlarms' in navigator), - "navigator.mozAlarms should not exist without permission"); - ok(!('AlarmsManager' in window), - "Interface AlarmsManager should not exist without permission"); - } - SpecialPowers.addPermission("alarms", true, document); - SimpleTest.finish(); - }); + SpecialPowers.removePermission("alarms", document); + // mozAlarms is installed on all platforms except Android for the moment. + if (navigator.appVersion.indexOf("Android") != -1) { + ok(!('mozAlarms' in navigator), + "navigator.mozAlarms should not exist without permission"); + ok(!('AlarmsManager' in window), + "Interface AlarmsManager should not exist"); + } else { + ok(!('mozAlarms' in navigator), + "navigator.mozAlarms should not exist without permission"); + ok(!('AlarmsManager' in window), + "Interface AlarmsManager should not exist without permission"); + } + SpecialPowers.addPermission("alarms", true, document); } diff --git a/dom/alarm/test/test_alarm_permitted_app.html b/dom/alarm/test/test_alarm_permitted_app.html index 42caee61324..9dc4f59dcb3 100644 --- a/dom/alarm/test/test_alarm_permitted_app.html +++ b/dom/alarm/test/test_alarm_permitted_app.html @@ -13,30 +13,24 @@ "use strict"; -SimpleTest.waitForExplicitFinish(); +SpecialPowers.addPermission("alarms", true, document); -SpecialPowers.pushPrefEnv({"set": [["dom.mozAlarms.enabled", true]]}, function() { - SpecialPowers.addPermission("alarms", true, document); - - // mozAlarms is installed on all platforms except Android for the moment. - if (navigator.appVersion.indexOf("Android") != -1) { - ok('AlarmsManager' in window, "Interface AlarmsManager should exist"); - try { - todo('mozAlarms' in navigator, - "mozAlarms is not allowed on Android for now. TODO Bug 863557."); - } catch (e) { - todo(!e, "('mozAlarms' in navigator) should not throw exceptions once " + - "mozAlarms is installed on Android. TODO Bug 863557. " + - "Caught exception: " + e); - } - } else { - ok('mozAlarms' in navigator, "navigator.mozAlarms should exist"); - ok(navigator.mozAlarms instanceof AlarmsManager, - "navigator.mozAlarms should be an instance of AlarmsManager"); +// mozAlarms is installed on all platforms except Android for the moment. +if (navigator.appVersion.indexOf("Android") != -1) { + ok('AlarmsManager' in window, "Interface AlarmsManager should exist"); + try { + todo('mozAlarms' in navigator, + "mozAlarms is not allowed on Android for now. TODO Bug 863557."); + } catch (e) { + todo(!e, "('mozAlarms' in navigator) should not throw exceptions once " + + "mozAlarms is installed on Android. TODO Bug 863557. " + + "Caught exception: " + e); } - - SimpleTest.finish(); -}); +} else { + ok('mozAlarms' in navigator, "navigator.mozAlarms should exist"); + ok(navigator.mozAlarms instanceof AlarmsManager, + "navigator.mozAlarms should be an instance of AlarmsManager"); +} diff --git a/dom/alarm/test/test_alarm_remove.html b/dom/alarm/test/test_alarm_remove.html index a50b0f663ec..8363628edc6 100644 --- a/dom/alarm/test/test_alarm_remove.html +++ b/dom/alarm/test/test_alarm_remove.html @@ -72,35 +72,31 @@ } function startTests() { - SpecialPowers.pushPrefEnv({ - "set": [["dom.mozAlarms.enabled", true]] - }, function() { - var isAllowedToTest = true; + var isAllowedToTest = true; - if (navigator.appVersion.indexOf("Android") !== -1) { - ok(true, "mozAlarms is not allowed on Android for now. " + - "TODO Bug 863557."); - isAllowedToTest = false; - } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == - SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { - ok(true, "mozAlarms is not allowed for non-installed apps. " + - "TODO Bug 876981."); - isAllowedToTest = false; + if (navigator.appVersion.indexOf("Android") !== -1) { + ok(true, "mozAlarms is not allowed on Android for now. " + + "TODO Bug 863557."); + isAllowedToTest = false; + } else if (SpecialPowers.wrap(document).nodePrincipal.appStatus == + SpecialPowers.Ci.nsIPrincipal.APP_STATUS_NOT_INSTALLED) { + ok(true, "mozAlarms is not allowed for non-installed apps. " + + "TODO Bug 876981."); + isAllowedToTest = false; + } + + if (isAllowedToTest) { + ok(true, "Start to test..."); + testAddRemove(); + } else { + // A sanity check to make sure we must run tests on Firefox OS (B2G). + if (navigator.userAgent.indexOf("Mobile") != -1 && + navigator.appVersion.indexOf("Android") == -1) { + ok(false, "Should run the test on Firefox OS (B2G)!"); } - if (isAllowedToTest) { - ok(true, "Start to test..."); - testAddRemove(); - } else { - // A sanity check to make sure we must run tests on Firefox OS (B2G). - if (navigator.userAgent.indexOf("Mobile") != -1 && - navigator.appVersion.indexOf("Android") == -1) { - ok(false, "Should run the test on Firefox OS (B2G)!"); - } - - SimpleTest.finish(); - } - }); + SimpleTest.finish(); + } } SimpleTest.expectAssertions(0, 9); diff --git a/dom/messages/test/test_bug_993732.html b/dom/messages/test/test_bug_993732.html index d26cc4928b9..8d0c419b489 100644 --- a/dom/messages/test/test_bug_993732.html +++ b/dom/messages/test/test_bug_993732.html @@ -46,18 +46,15 @@ } function startTests() { - - SpecialPowers.pushPrefEnv({"set": [["dom.mozAlarms.enabled", true]]}, function() { - // Currently applicable only on FxOS - if (navigator.userAgent.indexOf("Mobile") != -1 && - navigator.appVersion.indexOf("Android") == -1) - { - testAlarm(10000); - } else { - ok(true, "mozAlarms on Firefox OS only."); - SimpleTest.finish(); - } - }); + // Currently applicable only on FxOS + if (navigator.userAgent.indexOf("Mobile") != -1 && + navigator.appVersion.indexOf("Android") == -1) + { + testAlarm(10000); + } else { + ok(true, "mozAlarms on Firefox OS only."); + SimpleTest.finish(); + } } SimpleTest.expectAssertions(0, 9); diff --git a/dom/permission/tests/test_alarms.html b/dom/permission/tests/test_alarms.html index 284ba874b9a..36ff111a1b7 100644 --- a/dom/permission/tests/test_alarms.html +++ b/dom/permission/tests/test_alarms.html @@ -25,7 +25,6 @@ var gData = [ skip: ["Android"], obj: "mozAlarms", webidl: "AlarmsManager", - settings: [["dom.mozAlarms.enabled", true]], }, ] diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index d56bc0c40e9..6d50b72c6a1 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -113,7 +113,7 @@ var legacyMozPrefixedInterfaces = var interfaceNamesInGlobalScope = [ // IMPORTANT: Do not change this list without review from a DOM peer! - {name: "AlarmsManager", pref: "dom.mozAlarms.enabled"}, + {name: "AlarmsManager", permission: "alarms"}, // IMPORTANT: Do not change this list without review from a DOM peer! "AnalyserNode", // IMPORTANT: Do not change this list without review from a DOM peer! diff --git a/dom/webidl/AlarmsManager.webidl b/dom/webidl/AlarmsManager.webidl index eab77130240..66b69085b47 100644 --- a/dom/webidl/AlarmsManager.webidl +++ b/dom/webidl/AlarmsManager.webidl @@ -8,8 +8,7 @@ [NavigatorProperty="mozAlarms", JSImplementation="@mozilla.org/alarmsManager;1", - CheckPermissions="alarms", - Pref="dom.mozAlarms.enabled"] + CheckPermissions="alarms"] interface AlarmsManager { DOMRequest getAll(); DOMRequest add(any date, DOMString respectTimezone, optional any data); diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 45cbdd33871..0f088b564e5 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -3972,9 +3972,6 @@ pref("dom.mozContacts.enabled", false); pref("dom.navigator-property.disable.mozContacts", true); pref("dom.global-constructor.disable.mozContact", true); -// WebAlarms -pref("dom.mozAlarms.enabled", false); - // SimplePush pref("services.push.enabled", false); diff --git a/webapprt/prefs.js b/webapprt/prefs.js index 9aebfa47777..ef5c7fc1bd2 100644 --- a/webapprt/prefs.js +++ b/webapprt/prefs.js @@ -55,9 +55,6 @@ pref("dom.mozPay.enabled", true); // System messages pref("dom.sysmsg.enabled", true); -// Alarm API -pref("dom.mozAlarms.enabled", true); - // Disable slow script dialog for apps pref("dom.max_script_run_time", 0); pref("dom.max_chrome_script_run_time", 0);