This is targetted mozbrowser frame.
';
+ gInputFrame.src = 'file_browserElement_SetInputMethodActive.html';
document.body.appendChild(gInputFrame);
gInputFrame.addEventListener('mozbrowserloadend', countLoadend);
for (let i = 0; i < 2; i++) {
- let frame = gInputMethodFrames[i] = document.createElement('iframe');
- frame.setAttribute('mozbrowser', 'true');
- if (currentAppManifestURL) {
- frame.setAttribute('mozapp', currentAppManifestURL);
- }
- frame.src = 'file_empty.html#' + i;
- document.body.appendChild(frame);
+ let frame = gInputMethodFrames[i] = document.createElement('iframe');
+ frame.setAttribute('mozbrowser', 'true');
+ if (currentAppManifestURL) {
+ frame.setAttribute('mozapp', currentAppManifestURL);
+ }
frame.addEventListener('mozbrowserloadend', countLoadend);
+ frame.src = 'file_empty.html#' + i;
+ document.body.appendChild(frame);
}
}
diff --git a/dom/browser-element/mochitest/browserElement_SetNFCFocus.js b/dom/browser-element/mochitest/browserElement_SetNFCFocus.js
index 3332ca347e28..c76a56d3acf8 100644
--- a/dom/browser-element/mochitest/browserElement_SetNFCFocus.js
+++ b/dom/browser-element/mochitest/browserElement_SetNFCFocus.js
@@ -6,7 +6,6 @@
SimpleTest.waitForExplicitFinish();
browserElementTestHelpers.setEnabledPref(true);
-browserElementTestHelpers.addPermission();
function hasSetNFCFocus() {
return new Promise((resolve, reject) => {
@@ -22,9 +21,7 @@ function hasSetNFCFocus() {
}
function runTest() {
- SpecialPowers.pushPermissions(
- [{ 'type': 'nfc-manager', 'allow': 1, 'context': document }],
- () => hasSetNFCFocus().then(SimpleTest.finish));
+ hasSetNFCFocus().then(SimpleTest.finish);
}
addEventListener('testready', runTest);
diff --git a/dom/browser-element/mochitest/browserElement_SetVisible.js b/dom/browser-element/mochitest/browserElement_SetVisible.js
index cd8ed2a18825..dac8d7e427cd 100644
--- a/dom/browser-element/mochitest/browserElement_SetVisible.js
+++ b/dom/browser-element/mochitest/browserElement_SetVisible.js
@@ -7,7 +7,6 @@
SimpleTest.waitForExplicitFinish();
SimpleTest.requestFlakyTimeout("untriaged");
browserElementTestHelpers.setEnabledPref(true);
-browserElementTestHelpers.addPermission();
var iframeScript = function() {
content.document.addEventListener("visibilitychange", function() {
diff --git a/dom/browser-element/mochitest/browserElement_SetVisibleFrames.js b/dom/browser-element/mochitest/browserElement_SetVisibleFrames.js
index 222084e2c896..721248ab9922 100644
--- a/dom/browser-element/mochitest/browserElement_SetVisibleFrames.js
+++ b/dom/browser-element/mochitest/browserElement_SetVisibleFrames.js
@@ -12,18 +12,10 @@
SimpleTest.waitForExplicitFinish();
browserElementTestHelpers.setEnabledPref(true);
-browserElementTestHelpers.addPermission();
var iframe;
function runTest() {
- var principal = SpecialPowers.wrap(document).nodePrincipal;
- SpecialPowers.addPermission("browser", true, {url: SpecialPowers.wrap(principal.URI).spec,
- originAttributes: {
- appId: principal.appId,
- inIsolatedMozBrowser: true
- }});
-
iframe = document.createElement('iframe');
iframe.setAttribute('mozbrowser', 'true');
@@ -75,13 +67,6 @@ function finish() {
// expected, but if we don't remove our listener, then we'll end up causing
// the /next/ test to fail!
iframe.removeEventListener('mozbrowsershowmodalprompt', checkMessage);
-
- var principal = SpecialPowers.wrap(document).nodePrincipal;
- SpecialPowers.removePermission("browser", {url: SpecialPowers.wrap(principal.URI).spec,
- originAttributes: {
- appId: principal.appId,
- inIsolatedMozBrowser: true
- }});
SimpleTest.finish();
}
diff --git a/dom/browser-element/mochitest/browserElement_SetVisibleFrames2.js b/dom/browser-element/mochitest/browserElement_SetVisibleFrames2.js
index 911181c1619c..cf841a4707b0 100644
--- a/dom/browser-element/mochitest/browserElement_SetVisibleFrames2.js
+++ b/dom/browser-element/mochitest/browserElement_SetVisibleFrames2.js
@@ -8,16 +8,8 @@
SimpleTest.waitForExplicitFinish();
browserElementTestHelpers.setEnabledPref(true);
-browserElementTestHelpers.addPermission();
function runTest() {
- var principal = SpecialPowers.wrap(document).nodePrincipal;
- SpecialPowers.addPermission("browser", true, {url: SpecialPowers.wrap(principal.URI).spec,
- originAttributes: {
- appId: principal.appId,
- inIsolatedMozBrowser: true
- }});
-
var iframe = document.createElement('iframe');
iframe.setAttribute('mozbrowser', 'true');
@@ -57,13 +49,6 @@ function runTest() {
}
function finish() {
- var principal = SpecialPowers.wrap(document).nodePrincipal;
- SpecialPowers.removePermission("browser", {url: SpecialPowers.wrap(principal.URI).spec,
- originAttributes: {
- appId: principal.appId,
- inIsolatedMozBrowser: true
- }});
-
SimpleTest.finish();
}
diff --git a/dom/browser-element/mochitest/browserElement_Stop.js b/dom/browser-element/mochitest/browserElement_Stop.js
index ff7d5a635412..67720c148df9 100644
--- a/dom/browser-element/mochitest/browserElement_Stop.js
+++ b/dom/browser-element/mochitest/browserElement_Stop.js
@@ -12,7 +12,6 @@
SimpleTest.waitForExplicitFinish();
SimpleTest.requestFlakyTimeout("untriaged");
browserElementTestHelpers.setEnabledPref(true);
-browserElementTestHelpers.addPermission();
var iframe;
var stopped = false;
@@ -21,7 +20,8 @@ var imgSrc = 'http://test/tests/dom/browser-element/mochitest/file_bug709759.sjs
function runTest() {
iframe = document.createElement('iframe');
iframe.setAttribute('mozbrowser', 'true');
-
+ // FIXME: Bug 1270790
+ iframe.setAttribute('remote', 'true');
iframe.addEventListener('mozbrowserloadend', loadend);
iframe.src = 'data:text/html,' +
'This is targetted mozbrowser frame.
diff --git a/dom/browser-element/mochitest/file_illegal_web_manifest.html b/dom/browser-element/mochitest/file_illegal_web_manifest.html
index b4e06918950c..d9075b3fc6a2 100644
--- a/dom/browser-element/mochitest/file_illegal_web_manifest.html
+++ b/dom/browser-element/mochitest/file_illegal_web_manifest.html
@@ -1,6 +1,7 @@
global(aCx, aGlobal);
- if (nsContentUtils::IsSystemPrincipal(nsContentUtils::ObjectPrincipal(global))) {
- return true;
- }
-
- const char* const perms[] = { "tcp-socket", nullptr };
- return Preferences::GetBool("dom.mozTCPSocket.enabled") &&
- CheckAnyPermissions(aCx, global, perms);
+ return nsContentUtils::IsSystemPrincipal(nsContentUtils::ObjectPrincipal(global));
}
diff --git a/dom/network/tests/chrome.ini b/dom/network/tests/chrome.ini
index 7e2485643b42..eac7f20b0ea6 100644
--- a/dom/network/tests/chrome.ini
+++ b/dom/network/tests/chrome.ini
@@ -3,5 +3,11 @@ support-files =
tcpsocket_test.jsm
test_tcpsocket_client_and_server_basics.js
add_task.js
+ file_udpsocket_iframe.html
-[test_tcpsocket_jsm.html]
\ No newline at end of file
+[test_tcpsocket_jsm.html]
+[test_tcpsocket_client_and_server_basics.html]
+[test_tcpsocket_enabled_with_perm.html]
+skip-if = toolkit == "gonk"
+[test_tcpsocket_legacy.html]
+[test_udpsocket.html]
diff --git a/dom/network/tests/mochitest.ini b/dom/network/tests/mochitest.ini
index 31a5d089ceda..d5927e919f44 100644
--- a/dom/network/tests/mochitest.ini
+++ b/dom/network/tests/mochitest.ini
@@ -1,19 +1,13 @@
[DEFAULT]
support-files =
add_task.js
- file_udpsocket_iframe.html
- test_tcpsocket_client_and_server_basics.js
[test_network_basics.html]
skip-if = toolkit == "gonk" || toolkit == 'android'
-[test_tcpsocket_client_and_server_basics.html]
[test_tcpsocket_default_permissions.html]
skip-if = toolkit == "gonk"
[test_tcpsocket_enabled_no_perm.html]
skip-if = toolkit == "gonk"
-[test_tcpsocket_enabled_with_perm.html]
-skip-if = toolkit == "gonk"
-[test_tcpsocket_legacy.html]
[test_networkstats_alarms.html]
skip-if = toolkit != "gonk"
[test_networkstats_basics.html]
@@ -24,4 +18,3 @@ skip-if = toolkit != "gonk"
skip-if = toolkit != "gonk"
[test_networkstats_enabled_perm.html]
skip-if = toolkit != "gonk"
-[test_udpsocket.html]
\ No newline at end of file
diff --git a/dom/network/tests/test_tcpsocket_client_and_server_basics.html b/dom/network/tests/test_tcpsocket_client_and_server_basics.html
index 12e1d25e8833..4d304a978dc5 100644
--- a/dom/network/tests/test_tcpsocket_client_and_server_basics.html
+++ b/dom/network/tests/test_tcpsocket_client_and_server_basics.html
@@ -10,8 +10,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1084245
Test for Bug 1084245
-
-
+
+
-
+
+
@@ -17,9 +17,7 @@
the tcp-socket permission has been granted.
**/
SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({"set": [['dom.mozTCPSocket.enabled', true]]}, function() {
- SpecialPowers.pushPermissions([{type: "tcp-socket", allow: true, context: document}], runTest);
-});
+SpecialPowers.pushPrefEnv({"set": [['dom.mozTCPSocket.enabled', true]]}, runTest);
function runTest() {
ok('TCPSocket' in this, "TCPSocket should be accessible if dom.mozTCPSocket.enabled is true");
diff --git a/dom/network/tests/test_tcpsocket_legacy.html b/dom/network/tests/test_tcpsocket_legacy.html
index a75cbe3d79cb..3b35583ab34c 100644
--- a/dom/network/tests/test_tcpsocket_legacy.html
+++ b/dom/network/tests/test_tcpsocket_legacy.html
@@ -6,8 +6,8 @@ Test of legacy navigator interface for opening TCPSocket/TCPServerSocket.
Test for Bug 885982
-
-
+
+
Mozilla Bug 1084245
@@ -21,13 +21,7 @@ Test of legacy navigator interface for opening TCPSocket/TCPServerSocket.
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv(
{ set: [ ['dom.mozTCPSocket.enabled', true] ] },
- setPerms);
-
- function setPerms() {
- SpecialPowers.pushPermissions(
- [ { type: 'tcp-socket', allow: true, context: document } ],
- runTest);
- }
+ runTest);
function runTest() {
// See bug 903830; in e10s mode we never get to find out the localPort if we
diff --git a/dom/network/tests/test_udpsocket.html b/dom/network/tests/test_udpsocket.html
index 67478b76eda9..f1d03824a6b5 100644
--- a/dom/network/tests/test_udpsocket.html
+++ b/dom/network/tests/test_udpsocket.html
@@ -2,8 +2,8 @@
Test UDPSocket API
-
-
+
+
@@ -391,15 +391,12 @@ function runTest() {
}
window.addEventListener('load', function () {
- SpecialPowers.pushPermissions([
- {type: 'udp-socket', allow: true, context: document}], function() {
- SpecialPowers.pushPrefEnv({
- 'set': [
- ['dom.udpsocket.enabled', true],
- ['browser.sessionhistory.max_total_viewers', 10]
- ]
- }, runTest);
- });
+ SpecialPowers.pushPrefEnv({
+ 'set': [
+ ['dom.udpsocket.enabled', true],
+ ['browser.sessionhistory.max_total_viewers', 10]
+ ]
+ }, runTest);
});
diff --git a/dom/permission/tests/mochitest.ini b/dom/permission/tests/mochitest.ini
index 1147d870559f..1716adf15174 100644
--- a/dom/permission/tests/mochitest.ini
+++ b/dom/permission/tests/mochitest.ini
@@ -4,27 +4,39 @@ support-files =
file_shim.html
[test_alarms.html]
+skip-if = true
[test_browser.html]
+skip-if = true
[test_embed-apps.html]
-skip-if = ((buildapp == 'b2g') && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
+skip-if = true || e10s #Bug 931116, b2g desktop specific, initial triage ### Bug 1255339: blacklist because no more mozApps
[test_idle.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only failure
+# skip-if = (toolkit == 'gonk' && debug) #debug-only failure
+skip-if = true
[test_permission_basics.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(Bug 907770)
+skip-if = true || buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' || e10s # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(Bug 907770) ### Bug 1255339: blacklist because no more mozApps
[test_permissions.html]
+skip-if = true
[test_permissions_api.html]
[test_power.html]
+skip-if = true
[test_presentation-device-manage.html]
+skip-if = true
[test_systemXHR.html]
[test_tcp-socket.html]
+skip-if = true
[test_udp-socket.html]
+skip-if = true
[test_webapps-manage.html]
-skip-if = buildapp != 'b2g' && buildapp != 'mulet'
+# skip-if = buildapp != 'b2g' && buildapp != 'mulet'
+skip-if = true
[test_camera.html]
disabled = disabled until bug 859593 is fixed
[test_keyboard.html]
-skip-if = toolkit == 'android'
+# skip-if = toolkit == 'android'
+skip-if = true
[test_input-manage.html]
-skip-if = toolkit == 'android'
+# skip-if = toolkit == 'android'
+skip-if = true
[test_wifi-manage.html]
-skip-if = (buildapp != 'b2g') || (buildapp == 'b2g' && toolkit != 'gonk') #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
+# skip-if = (buildapp != 'b2g') || (buildapp == 'mulet') || (buildapp == 'b2g' && toolkit != 'gonk') #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
+skip-if = true
diff --git a/dom/power/moz.build b/dom/power/moz.build
index 3bd2dfa99d09..5f3911589697 100644
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -32,4 +32,5 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
diff --git a/dom/power/test/browser_wakelocks.js b/dom/power/test/browser_wakelocks.js
index 3347ee307618..5bd4de67c9f4 100644
--- a/dom/power/test/browser_wakelocks.js
+++ b/dom/power/test/browser_wakelocks.js
@@ -227,10 +227,6 @@ function runNextStep() {
}
function test() {
- SpecialPowers.pushPermissions([
- {type: "power", allow: true, context: kUrlSource}
- ], function () {
- SpecialPowers.pushPrefEnv({"set": [["dom.wakelock.enabled", true]]},
- runNextStep);
- });
+ SpecialPowers.pushPrefEnv({"set": [["dom.wakelock.enabled", true]]},
+ runNextStep);
}
diff --git a/dom/power/test/chrome.ini b/dom/power/test/chrome.ini
new file mode 100644
index 000000000000..e1b97475e4f5
--- /dev/null
+++ b/dom/power/test/chrome.ini
@@ -0,0 +1,9 @@
+[test_power_basics.html]
+[test_power_set_cpusleepallowed.html]
+skip-if = toolkit != "gonk"
+[test_power_set_screen_brightness.html]
+skip-if = toolkit != "gonk"
+[test_power_set_screen_enabled.html]
+skip-if = toolkit != "gonk"
+[test_power_set_key_light_enabled.html]
+skip-if = toolkit != "gonk"
diff --git a/dom/power/test/mochitest.ini b/dom/power/test/mochitest.ini
index 3307307e3e00..26070e6a54a4 100644
--- a/dom/power/test/mochitest.ini
+++ b/dom/power/test/mochitest.ini
@@ -2,12 +2,3 @@
[test_bug957899.html]
[test_wakelock_not_exposed.html]
skip-if = appname == "b2g" || buildapp == "mulet"
-[test_power_basics.html]
-[test_power_set_cpusleepallowed.html]
-skip-if = toolkit != "gonk"
-[test_power_set_screen_brightness.html]
-skip-if = toolkit != "gonk"
-[test_power_set_screen_enabled.html]
-skip-if = toolkit != "gonk"
-[test_power_set_key_light_enabled.html]
-skip-if = toolkit != "gonk"
diff --git a/dom/power/test/test_power_basics.html b/dom/power/test/test_power_basics.html
index 02e5dab268d8..b78c99f488b1 100644
--- a/dom/power/test/test_power_basics.html
+++ b/dom/power/test/test_power_basics.html
@@ -2,39 +2,23 @@
Test for Power API
-
-
+
+
+
+
@@ -41,19 +41,13 @@
SimpleTest.expectAssertions(0, 9);
SimpleTest.waitForExplicitFinish();
- if (SpecialPowers.hasPermission("power", document)) {
- // Currently only applicable on FxOS
- if (navigator.userAgent.indexOf("Mobile") != -1 &&
- navigator.appVersion.indexOf("Android") == -1) {
- startTests();
- } else {
- ok(true, "mozPower on Firefox OS only.");
- SimpleTest.finish();
- }
+ // Currently only applicable on FxOS
+ if (navigator.userAgent.indexOf("Mobile") != -1 &&
+ navigator.appVersion.indexOf("Android") == -1) {
+ startTests();
} else {
- // Add the permission and reload so it's propogated
- SpecialPowers.addPermission("power", true, document);
- window.location.reload();
+ ok(true, "mozPower on Firefox OS only.");
+ SimpleTest.finish();
}
diff --git a/dom/power/test/test_power_set_key_light_enabled.html b/dom/power/test/test_power_set_key_light_enabled.html
index 96b9cc0db202..512b17dc99a6 100644
--- a/dom/power/test/test_power_set_key_light_enabled.html
+++ b/dom/power/test/test_power_set_key_light_enabled.html
@@ -3,8 +3,8 @@
Test Enabling/Disabling Screen with Power Management API
-
-
+
+
@@ -44,19 +44,13 @@
}
SimpleTest.waitForExplicitFinish();
- if (SpecialPowers.hasPermission("power", document)) {
- // Currently only applicable on FxOS
- if (navigator.userAgent.indexOf("Mobile") != -1 &&
- navigator.appVersion.indexOf("Android") == -1) {
- startTests();
- } else {
- ok(true, "mozPower on Firefox OS only.");
- SimpleTest.finish();
- }
+ // Currently only applicable on FxOS
+ if (navigator.userAgent.indexOf("Mobile") != -1 &&
+ navigator.appVersion.indexOf("Android") == -1) {
+ startTests();
} else {
- // Add the permission and reload so it's propogated
- SpecialPowers.addPermission("power", true, document);
- window.location.reload();
+ ok(true, "mozPower on Firefox OS only.");
+ SimpleTest.finish();
}
diff --git a/dom/power/test/test_power_set_screen_brightness.html b/dom/power/test/test_power_set_screen_brightness.html
index 6d74568545f1..1d66d8f1fa5b 100644
--- a/dom/power/test/test_power_set_screen_brightness.html
+++ b/dom/power/test/test_power_set_screen_brightness.html
@@ -3,8 +3,8 @@
Test Setting Screen Brightness with Power Management API
-
-
+
+
@@ -56,19 +56,13 @@
SimpleTest.expectAssertions(0, 9);
SimpleTest.waitForExplicitFinish();
- if (SpecialPowers.hasPermission("power", document)) {
- // Currently only applicable on FxOS
- if (navigator.userAgent.indexOf("Mobile") != -1 &&
- navigator.appVersion.indexOf("Android") == -1) {
- startTests();
- } else {
- ok(true, "mozPower on Firefox OS only.");
- SimpleTest.finish();
- }
+ // Currently only applicable on FxOS
+ if (navigator.userAgent.indexOf("Mobile") != -1 &&
+ navigator.appVersion.indexOf("Android") == -1) {
+ startTests();
} else {
- // Add the permission and reload so it's propogated
- SpecialPowers.addPermission("power", true, document);
- window.location.reload();
+ ok(true, "mozPower on Firefox OS only.");
+ SimpleTest.finish();
}
diff --git a/dom/power/test/test_power_set_screen_enabled.html b/dom/power/test/test_power_set_screen_enabled.html
index caedf9913fe2..8fe2aac4a8c6 100644
--- a/dom/power/test/test_power_set_screen_enabled.html
+++ b/dom/power/test/test_power_set_screen_enabled.html
@@ -3,8 +3,8 @@
Test Enabling/Disabling Screen with Power Management API
-
-
+
+
@@ -45,19 +45,13 @@
SimpleTest.expectAssertions(0, 9);
SimpleTest.waitForExplicitFinish();
- if (SpecialPowers.hasPermission("power", document)) {
- // Currently only applicable on FxOS
- if (navigator.userAgent.indexOf("Mobile") != -1 &&
- navigator.appVersion.indexOf("Android") == -1) {
- startTests();
- } else {
- ok(true, "mozPower on Firefox OS only.");
- SimpleTest.finish();
- }
+ // Currently only applicable on FxOS
+ if (navigator.userAgent.indexOf("Mobile") != -1 &&
+ navigator.appVersion.indexOf("Android") == -1) {
+ startTests();
} else {
- // Add the permission and reload so it's propogated
- SpecialPowers.addPermission("power", true, document);
- window.location.reload();
+ ok(true, "mozPower on Firefox OS only.");
+ SimpleTest.finish();
}
diff --git a/dom/presentation/tests/mochitest/chrome.ini b/dom/presentation/tests/mochitest/chrome.ini
index f90b77b6e961..6738682d5d77 100644
--- a/dom/presentation/tests/mochitest/chrome.ini
+++ b/dom/presentation/tests/mochitest/chrome.ini
@@ -1,4 +1,14 @@
[DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+support-files =
+ PresentationDeviceInfoChromeScript.js
+ PresentationSessionChromeScript.js
[test_presentation_datachannel_sessiontransport.html]
+skip-if = buildapp == 'b2g' || os == 'android'
+[test_presentation_device_info.html]
+[test_presentation_sender_startWithDevice.html]
+skip-if = toolkit == 'android' # Bug 1129785
+[test_presentation_tcp_sender.html]
+skip-if = toolkit == 'android' # Bug 1129785
+[test_presentation_tcp_sender_default_request.html]
+skip-if = toolkit == 'android' # Bug 1129785
diff --git a/dom/presentation/tests/mochitest/mochitest.ini b/dom/presentation/tests/mochitest/mochitest.ini
index 50c3b788aa73..db5f0bb42ce7 100644
--- a/dom/presentation/tests/mochitest/mochitest.ini
+++ b/dom/presentation/tests/mochitest/mochitest.ini
@@ -29,18 +29,11 @@ skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
[test_presentation_1ua_connection_wentaway_oop.html]
skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android') # Bug 1129785
-[test_presentation_device_info.html]
[test_presentation_device_info_permission.html]
-[test_presentation_sender_startWithDevice.html]
-skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_sender_disconnect.html]
skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_sender_establish_connection_error.html]
skip-if = toolkit == 'android' # Bug 1129785
-[test_presentation_tcp_sender.html]
-skip-if = toolkit == 'android' # Bug 1129785
-[test_presentation_tcp_sender_default_request.html]
-skip-if = toolkit == 'android' # Bug 1129785
[test_presentation_tcp_receiver_establish_connection_error.html]
skip-if = (e10s || toolkit == 'gonk' || toolkit == 'android' || os == 'mac' || os == 'win' || buildapp == 'mulet') # Bug 1129785, Bug 1204709
[test_presentation_tcp_receiver_establish_connection_timeout.html]
diff --git a/dom/presentation/tests/mochitest/test_presentation_device_info.html b/dom/presentation/tests/mochitest/test_presentation_device_info.html
index 211ccaf68c57..77253e41dba3 100644
--- a/dom/presentation/tests/mochitest/test_presentation_device_info.html
+++ b/dom/presentation/tests/mochitest/test_presentation_device_info.html
@@ -5,8 +5,8 @@
Test for B2G Presentation Device Info API
-
-
+
+
Test for B2G Presentation Device Info API
@@ -131,15 +131,11 @@ function runTests() {
}
window.addEventListener('load', function() {
- SpecialPowers.pushPermissions([
- {type: 'presentation-device-manage', allow: true, context: document},
- ], function() {
- SpecialPowers.pushPrefEnv({
- 'set': [
- ['dom.presentation.enabled', true],
- ]
- }, runTests);
- });
+ SpecialPowers.pushPrefEnv({
+ 'set': [
+ ['dom.presentation.enabled', true],
+ ]
+ }, runTests);
});
diff --git a/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html b/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html
index 149eb39e4cb9..c7f7ac96d4df 100644
--- a/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html
+++ b/dom/presentation/tests/mochitest/test_presentation_device_info_permission.html
@@ -22,15 +22,11 @@ function runTests() {
}
window.addEventListener('load', function() {
- SpecialPowers.pushPermissions([
- {type: 'presentation-device-manage', allow: false, context: document},
- ], function() {
- SpecialPowers.pushPrefEnv({
- 'set': [
- ['dom.presentation.enabled', true],
- ]
- }, runTests);
- });
+ SpecialPowers.pushPrefEnv({
+ 'set': [
+ ['dom.presentation.enabled', true],
+ ]
+ }, runTests);
});
diff --git a/dom/presentation/tests/mochitest/test_presentation_sender_startWithDevice.html b/dom/presentation/tests/mochitest/test_presentation_sender_startWithDevice.html
index be05f415c7ec..21a7b25a4972 100644
--- a/dom/presentation/tests/mochitest/test_presentation_sender_startWithDevice.html
+++ b/dom/presentation/tests/mochitest/test_presentation_sender_startWithDevice.html
@@ -5,8 +5,8 @@
Test startWithDevice for B2G Presentation API at sender side
-
-
+
+
Test startWithDevice for B2G Presentation API at sender side
@@ -160,16 +160,11 @@ function runTests() {
}
SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPermissions([
- {type: 'presentation-device-manage', allow: true, context: document},
- {type: 'presentation', allow: true, context: document},
-], function() {
- SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
- ["dom.presentation.session_transport.data_channel.enable", false],
- ["dom.presentation.test.enabled", true],
- ["dom.presentation.test.stage", 0]]},
- runTests);
-});
+SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
+ ["dom.presentation.session_transport.data_channel.enable", false],
+ ["dom.presentation.test.enabled", true],
+ ["dom.presentation.test.stage", 0]]},
+ runTests);
diff --git a/dom/presentation/tests/mochitest/test_presentation_tcp_sender.html b/dom/presentation/tests/mochitest/test_presentation_tcp_sender.html
index f100df7e69c1..d923d9e97a9e 100644
--- a/dom/presentation/tests/mochitest/test_presentation_tcp_sender.html
+++ b/dom/presentation/tests/mochitest/test_presentation_tcp_sender.html
@@ -5,8 +5,8 @@
Test for B2G Presentation API at sender side
-
-
+
+
Test for B2G Presentation API at sender side
@@ -190,14 +190,9 @@ function runTests() {
}
SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPermissions([
- {type: 'presentation-device-manage', allow: false, context: document},
- {type: 'presentation', allow: true, context: document},
-], function() {
- SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
- ["dom.presentation.session_transport.data_channel.enable", false]]},
- runTests);
-});
+SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
+ ["dom.presentation.session_transport.data_channel.enable", false]]},
+ runTests);
diff --git a/dom/presentation/tests/mochitest/test_presentation_tcp_sender_default_request.html b/dom/presentation/tests/mochitest/test_presentation_tcp_sender_default_request.html
index 5776318f6d32..1f49d8554b24 100644
--- a/dom/presentation/tests/mochitest/test_presentation_tcp_sender_default_request.html
+++ b/dom/presentation/tests/mochitest/test_presentation_tcp_sender_default_request.html
@@ -5,8 +5,8 @@
Test default request for B2G Presentation API at sender side
-
-
+
+
Test default request for B2G Presentation API at sender side
@@ -139,14 +139,9 @@ function runTests() {
}
SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPermissions([
- {type: 'presentation-device-manage', allow: false, context: document},
- {type: 'presentation', allow: true, context: document},
-], function() {
- SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
- ["dom.presentation.session_transport.data_channel.enable", false]]},
- runTests);
-});
+SpecialPowers.pushPrefEnv({ 'set': [["dom.presentation.enabled", true],
+ ["dom.presentation.session_transport.data_channel.enable", false]]},
+ runTests);
diff --git a/dom/settings/moz.build b/dom/settings/moz.build
index 0588a22419dd..4eef125de282 100644
--- a/dom/settings/moz.build
+++ b/dom/settings/moz.build
@@ -18,13 +18,11 @@ if CONFIG['MOZ_B2G']:
'SettingsService.manifest',
]
- MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
-
EXTRA_JS_MODULES += [
'SettingsDB.jsm',
'SettingsRequestManager.jsm'
]
-MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
diff --git a/dom/settings/tests/chrome.ini b/dom/settings/tests/chrome.ini
index f2fca29a73c7..ba8624dac608 100644
--- a/dom/settings/tests/chrome.ini
+++ b/dom/settings/tests/chrome.ini
@@ -1,10 +1,23 @@
[DEFAULT]
-skip-if = buildapp != 'b2g'
support-files =
+ file_loadserver.js
+ file_bug1110872.js
+ file_bug1110872.html
test_settings_service.js
test_settings_service_callback.js
-
[test_settings_service.xul]
-skip-if= buildapp == 'mulet'
+run-if = buildapp == 'b2g' || buildapp == 'mulet'
[test_settings_service_callback.xul]
+run-if = buildapp == 'b2g' || buildapp == 'mulet'
+[test_settings_basics.html]
+[test_settings_permissions.html]
+[test_settings_blobs.html]
+[test_settings_data_uris.html]
+[test_settings_events.html]
+[test_settings_navigator_object.html]
+[test_settings_onsettingchange.html]
+[test_settings_bug1110872.html]
+skip-if = !e10s
+[test_settings_observer_killer.html]
+skip-if = !debug
diff --git a/dom/settings/tests/file_bug1110872.html b/dom/settings/tests/file_bug1110872.html
index 68cdfc86fe69..3dcc45b822f3 100644
--- a/dom/settings/tests/file_bug1110872.html
+++ b/dom/settings/tests/file_bug1110872.html
@@ -5,11 +5,6 @@
-
-
+
+
@@ -23,11 +23,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
var url = SimpleTest.getTestFileURL("file_loadserver.js");
var script = SpecialPowers.loadChromeScript(url);
-SpecialPowers.addPermission("settings-api-read", true, document);
-SpecialPowers.addPermission("settings-api-write", true, document);
-SpecialPowers.addPermission("settings-read", true, document);
-SpecialPowers.addPermission("settings-write", true, document);
-SpecialPowers.addPermission("settings-clear", true, document);
function onUnwantedSuccess() {
ok(false, "onUnwantedSuccess: shouldn't get here");
diff --git a/dom/settings/tests/test_settings_blobs.html b/dom/settings/tests/test_settings_blobs.html
index 69ac21fb6d88..6d24111cf8cc 100644
--- a/dom/settings/tests/test_settings_blobs.html
+++ b/dom/settings/tests/test_settings_blobs.html
@@ -6,8 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=821630
Test for Bug 821630 Settings API
-
-
+
+
@@ -23,11 +23,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=821630
var url = SimpleTest.getTestFileURL("file_loadserver.js");
var script = SpecialPowers.loadChromeScript(url);
-SpecialPowers.addPermission("settings-read", true, document);
-SpecialPowers.addPermission("settings-write", true, document);
-SpecialPowers.addPermission("settings-api-read", true, document);
-SpecialPowers.addPermission("settings-api-write", true, document);
-SpecialPowers.addPermission("settings-clear", true, document);
function onUnwantedSuccess() {
ok(false, "onUnwantedSuccess: shouldn't get here");
diff --git a/dom/settings/tests/test_settings_bug1110872.html b/dom/settings/tests/test_settings_bug1110872.html
index 84482708241b..296c71a8c6f2 100644
--- a/dom/settings/tests/test_settings_bug1110872.html
+++ b/dom/settings/tests/test_settings_bug1110872.html
@@ -3,8 +3,8 @@
Test for Bug {1110872} Settings API
-
-
+
+
-
-
+
+
@@ -23,11 +23,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=806374
var url = SimpleTest.getTestFileURL("file_loadserver.js");
var script = SpecialPowers.loadChromeScript(url);
-SpecialPowers.addPermission("settings-read", true, document);
-SpecialPowers.addPermission("settings-write", true, document);
-SpecialPowers.addPermission("settings-api-read", true, document);
-SpecialPowers.addPermission("settings-api-write", true, document);
-SpecialPowers.addPermission("settings-clear", true, document);
function onUnwantedSuccess() {
ok(false, "onUnwantedSuccess: shouldn't get here");
diff --git a/dom/settings/tests/test_settings_events.html b/dom/settings/tests/test_settings_events.html
index 815e24f25429..a8bf851be309 100644
--- a/dom/settings/tests/test_settings_events.html
+++ b/dom/settings/tests/test_settings_events.html
@@ -5,8 +5,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=678695
-->
Test for Bug 678695
-
-
+
+
Mozilla Bug 678695
@@ -16,10 +16,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=678695
-
-
+
+
@@ -30,16 +30,7 @@ function testPref() {
});
}
-SpecialPowers.pushPermissions([
- {type: "settings-read", allow: 0, context: document},
- {type: "settings-write", allow: 0, context: document},
- {type: "settings-api-read", allow: 0, context: document},
- {type: "settings-api-write", allow: 0, context: document},
- {type: "settings-clear", allow: 0, context: document}
-], function() {
- is(frames[0].navigator.mozSettings, undefined, "navigator.mozSettings is undefined when the page doesn't have permissions");
- testPref();
-});
+testPref();
diff --git a/dom/settings/tests/test_settings_observer_killer.html b/dom/settings/tests/test_settings_observer_killer.html
index 462515b10aa8..8e7ed973c887 100644
--- a/dom/settings/tests/test_settings_observer_killer.html
+++ b/dom/settings/tests/test_settings_observer_killer.html
@@ -6,8 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1193469
Test for Bug 1193469 Settings API
-
-
+
+
@@ -24,43 +24,35 @@ var script = SpecialPowers.loadChromeScript(url);
SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPermissions([
- {type: "settings-api-read", allow: 1, context: document},
- {type: "settings-api-write", allow: 1, context: document},
- {type: "settings-read", allow: 1, context: document},
- {type: "settings-write", allow: 1, context: document},
- {type: "settings-clear", allow: 1, context: document}
-], function() {
- SpecialPowers.pushPrefEnv({
- set: [["dom.mozSettings.enabled", true]]
- },
- function () {
- ok(true, "abusing observers");
+SpecialPowers.pushPrefEnv({
+ set: [["dom.mozSettings.enabled", true]]
+},
+ function () {
+ ok(true, "abusing observers");
- var obs;
- for (obs = 0; obs < 9; obs++) {
- navigator.mozSettings.addObserver("fake.setting.key", function(v) {
- // nothing to do for real ...
- ok(false, "should not be called");
- });
- ok(true, "first: added observer #" + obs);
- }
- ok(true, "adding first observers, should not have thrown");
+ var obs;
+ for (obs = 0; obs < 9; obs++) {
+ navigator.mozSettings.addObserver("fake.setting.key", function(v) {
+ // nothing to do for real ...
+ ok(false, "should not be called");
+ });
+ ok(true, "first: added observer #" + obs);
+ }
+ ok(true, "adding first observers, should not have thrown");
- try {
- ok(true, "second: adding new observer");
- navigator.mozSettings.addObserver("fake.setting.key", function(v) {
- // nothing to do for real ...
- ok(false, "should not be called");
- });
- ok(false, "adding too many observers should have thrown");
- } catch (ex) {
- ok(true, "got exception when trying to add too many observers");
- }
+ try {
+ ok(true, "second: adding new observer");
+ navigator.mozSettings.addObserver("fake.setting.key", function(v) {
+ // nothing to do for real ...
+ ok(false, "should not be called");
+ });
+ ok(false, "adding too many observers should have thrown");
+ } catch (ex) {
+ ok(true, "got exception when trying to add too many observers");
+ }
- SimpleTest.finish();
- });
-});
+ SimpleTest.finish();
+ });
diff --git a/dom/settings/tests/test_settings_onsettingchange.html b/dom/settings/tests/test_settings_onsettingchange.html
index 86030cced28a..974da0c636bc 100644
--- a/dom/settings/tests/test_settings_onsettingchange.html
+++ b/dom/settings/tests/test_settings_onsettingchange.html
@@ -6,8 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=678695
Test for Bug 678695 Settings API
-
-
+
+
@@ -23,11 +23,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=678695
var url = SimpleTest.getTestFileURL("file_loadserver.js");
var script = SpecialPowers.loadChromeScript(url);
-SpecialPowers.addPermission("settings-write", true, document);
-SpecialPowers.addPermission("settings-read", true, document);
-SpecialPowers.addPermission("settings-api-read", true, document);
-SpecialPowers.addPermission("settings-api-write", true, document);
-SpecialPowers.addPermission("settings-clear", true, document);
var screenBright = {"screen.brightness": 0.7};
diff --git a/dom/settings/tests/test_settings_permissions.html b/dom/settings/tests/test_settings_permissions.html
index 26b5d295fcf3..4cc02385aa51 100644
--- a/dom/settings/tests/test_settings_permissions.html
+++ b/dom/settings/tests/test_settings_permissions.html
@@ -6,8 +6,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
Test for Bug {678695} Settings API
-
-
+
+
@@ -23,20 +23,15 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={678695}
var url = SimpleTest.getTestFileURL("file_loadserver.js");
var script = SpecialPowers.loadChromeScript(url);
-SpecialPowers.removePermission("settings-read", document);
-SpecialPowers.removePermission("settings-write", document);
-SpecialPowers.addPermission("settings-api-read", true, document);
-SpecialPowers.addPermission("settings-api-write", true, document);
-SpecialPowers.addPermission("settings:wallpaper.image-read", true, document);
-SpecialPowers.addPermission("settings:wallpaper.image-write", true, document);
-SpecialPowers.addPermission("settings-clear", true, document);
function onUnwantedSuccess() {
ok(false, "onUnwantedSuccess: shouldn't get here");
}
+// No more permissions, so failure cannot happen
function onFailure() {
- ok(false, "in on Failure!");
+ ok(true, "in on Failure!");
+ next();
}
const wifi = {"wifi.enabled": false}
diff --git a/dom/tests/mochitest/general/chrome.ini b/dom/tests/mochitest/general/chrome.ini
index d34475d27066..e3622b5435f5 100644
--- a/dom/tests/mochitest/general/chrome.ini
+++ b/dom/tests/mochitest/general/chrome.ini
@@ -6,4 +6,6 @@ skip-if = buildapp == 'b2g' || os == 'android'
[test_offsets.js]
[test_offsets.xul]
skip-if = buildapp == 'mulet'
+[test_idleapi_permissions.html]
+skip-if = buildapp == 'b2g' || buildapp == 'mulet'
[test_spacetopagedown.html]
diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini
index 06f382902133..8bda3ef5172d 100644
--- a/dom/tests/mochitest/general/mochitest.ini
+++ b/dom/tests/mochitest/general/mochitest.ini
@@ -83,8 +83,6 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIME
[test_pointerPreserves3D.html]
[test_pointerPreserves3DClip.html]
[test_framedhistoryframes.html]
-[test_idleapi_permissions.html]
-skip-if = buildapp == 'b2g' || buildapp == 'mulet'
[test_img_mutations.html]
[test_interfaces.html]
skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
diff --git a/dom/tests/mochitest/general/test_idleapi_permissions.html b/dom/tests/mochitest/general/test_idleapi_permissions.html
index ccd4c8ca83c8..4f690f462979 100644
--- a/dom/tests/mochitest/general/test_idleapi_permissions.html
+++ b/dom/tests/mochitest/general/test_idleapi_permissions.html
@@ -2,8 +2,8 @@
Test for idle api permissions
-
-
+
+
@@ -33,9 +33,6 @@ function run_test() {
// addIdleObserver checks whether time is > 0.
this.idleObserver.time = 100;
- var added = doAddIdleObserver(this.idleObserver, false);
- ok(!added, "Should not be able to add idle observer without permission");
-
SpecialPowers.pushPermissions([{type: "idle", allow: true, context: document}], () => {
added = doAddIdleObserver(this.idleObserver, true);
ok(added, "Should be able to add idle observer with permission.");
diff --git a/dom/tests/mochitest/geolocation/chrome.ini b/dom/tests/mochitest/geolocation/chrome.ini
new file mode 100644
index 000000000000..19eb5de5ed4a
--- /dev/null
+++ b/dom/tests/mochitest/geolocation/chrome.ini
@@ -0,0 +1,9 @@
+[DEFAULT]
+support-files =
+ geolocation.html
+ geolocation_common.js
+
+[test_mozsettings.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android'
+[test_mozsettingsWatch.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android'
diff --git a/dom/tests/mochitest/geolocation/mochitest.ini b/dom/tests/mochitest/geolocation/mochitest.ini
index 85d1574fc5ff..1e908cf766ef 100644
--- a/dom/tests/mochitest/geolocation/mochitest.ini
+++ b/dom/tests/mochitest/geolocation/mochitest.ini
@@ -36,10 +36,6 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_manyWindows.html]
skip-if = buildapp == 'b2g'
-[test_mozsettings.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
-[test_mozsettingsWatch.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android'
[test_optional_api_params.html]
skip-if = buildapp == 'b2g'
[test_shutdown.html]
diff --git a/dom/tests/mochitest/geolocation/test_mozsettings.html b/dom/tests/mochitest/geolocation/test_mozsettings.html
index 12c9ee90e145..92698d8302a5 100644
--- a/dom/tests/mochitest/geolocation/test_mozsettings.html
+++ b/dom/tests/mochitest/geolocation/test_mozsettings.html
@@ -5,10 +5,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
-->
Test for getCurrentPosition
-
+
-
+
Mozilla Bug 777594
@@ -25,20 +25,11 @@ SimpleTest.requestFlakyTimeout("untriaged");
var timeToWaitMs = 1000;
resume_geolocationProvider(function() {
- force_prompt(true, test1);
+ force_prompt(true, test2);
});
SpecialPowers.importInMainProcess("resource://gre/modules/SettingsRequestManager.jsm");
-function test1() {
- //This pushPermissions call is after pushPrefEnv call and pushPrefEnv calls follow after this
- SpecialPowers.pushPermissions([{'type': 'settings-read', 'allow': true, 'context': document},
- {'type': 'settings-write', 'allow': true, 'context': document},
- {'type': 'settings-api-write', 'allow': true, 'context': document},
- {'type': 'settings-api-read', 'allow': true, 'context': document}
- ], test2);
-}
-
function test2() {
ok(navigator.geolocation, "get geolocation object");
diff --git a/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html b/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
index 4d1137d36c39..d44a19911f59 100644
--- a/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
+++ b/dom/tests/mochitest/geolocation/test_mozsettingsWatch.html
@@ -5,10 +5,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=478911
-->
Test for getCurrentPosition
-
+
-
+
Mozilla Bug 777594
@@ -23,20 +23,11 @@ SimpleTest.waitForExplicitFinish();
SimpleTest.requestFlakyTimeout("untriaged");
resume_geolocationProvider(function() {
- force_prompt(true, test1);
+ force_prompt(true, test2);
});
SpecialPowers.importInMainProcess("resource://gre/modules/SettingsRequestManager.jsm");
-function test1() {
- //This pushPermissions call is after pushPrefEnv call and pushPrefEnv calls follow after this
- SpecialPowers.pushPermissions([{'type': 'settings-read', 'allow': true, 'context': document},
- {'type': 'settings-write', 'allow': true, 'context': document},
- {'type': 'settings-api-write', 'allow': true, 'context': document},
- {'type': 'settings-api-read', 'allow': true, 'context': document}
- ], test2);
-}
-
var watchId;
function test2() {
ok(navigator.geolocation, "get geolocation object");
diff --git a/dom/tests/mochitest/notification/chrome.ini b/dom/tests/mochitest/notification/chrome.ini
new file mode 100644
index 000000000000..2f6b3b4932d1
--- /dev/null
+++ b/dom/tests/mochitest/notification/chrome.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+
+support-files =
+ MockServices.js
+ NotificationTest.js
+
+[test_notification_noresend.html]
+skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
diff --git a/dom/tests/mochitest/notification/mochitest.ini b/dom/tests/mochitest/notification/mochitest.ini
index 034826ee1d16..71483cabbf79 100644
--- a/dom/tests/mochitest/notification/mochitest.ini
+++ b/dom/tests/mochitest/notification/mochitest.ini
@@ -9,6 +9,4 @@ support-files =
[test_bug931307.html]
skip-if = (os == 'android') # Bug 1258975 on android.
[test_notification_resend.html]
-skip-if = (buildapp != 'b2g' && buildapp != 'mulet') || e10s # On e10s, faking the app seems to be failing
-[test_notification_noresend.html]
-skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
+skip-if = true ### Bug 1255339: blacklist because no more mozApps
diff --git a/dom/tests/mochitest/notification/test_notification_noresend.html b/dom/tests/mochitest/notification/test_notification_noresend.html
index 7bd372db2ad3..ce78d8a921ab 100644
--- a/dom/tests/mochitest/notification/test_notification_noresend.html
+++ b/dom/tests/mochitest/notification/test_notification_noresend.html
@@ -2,10 +2,10 @@
Testing mozResendAllNotifications() resend behavior for Pages
-
+
-
+
Bug 1159128
diff --git a/dom/tests/moz.build b/dom/tests/moz.build
index 7f204911a570..bc7c1e098a00 100644
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -34,7 +34,9 @@ MOCHITEST_CHROME_MANIFESTS += [
'mochitest/beacon/chrome.ini',
'mochitest/chrome/chrome.ini',
'mochitest/general/chrome.ini',
+ 'mochitest/geolocation/chrome.ini',
'mochitest/localstorage/chrome.ini',
+ 'mochitest/notification/chrome.ini',
'mochitest/sessionstorage/chrome.ini',
'mochitest/whatwg/chrome.ini',
]
diff --git a/dom/tv/moz.build b/dom/tv/moz.build
index 1ec56c06b28f..032597fbe139 100644
--- a/dom/tv/moz.build
+++ b/dom/tv/moz.build
@@ -42,7 +42,9 @@ EXTRA_COMPONENTS += [
XPIDL_MODULE = 'dom_tv'
-MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
+
+MOCHITEST_CHROME_MANIFESTS += ['test/mochitest/chrome.ini']
XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell/xpcshell.ini']
diff --git a/dom/tv/test/mochitest/chrome.ini b/dom/tv/test/mochitest/chrome.ini
new file mode 100644
index 000000000000..02c214efb20d
--- /dev/null
+++ b/dom/tv/test/mochitest/chrome.ini
@@ -0,0 +1,19 @@
+[DEFAULT]
+support-files =
+ head.js
+ mock_data.json
+
+[test_tv_permitted_app.html]
+[test_tv_get_tuners.html]
+[test_tv_get_sources.html]
+[test_tv_get_channels.html]
+[test_tv_get_channels_during_scanning.html]
+[test_tv_get_programs.html]
+[test_tv_get_current_program.html]
+[test_tv_set_current_source.html]
+[test_tv_set_invalid_current_source.html]
+[test_tv_set_current_channel.html]
+[test_tv_set_current_channel_during_scanning.html]
+[test_tv_set_invalid_current_channel.html]
+[test_tv_scan_channels_stopped.html]
+[test_tv_scan_channels_completed.html]
diff --git a/dom/tv/test/mochitest/head.js b/dom/tv/test/mochitest/head.js
index 1962a7dfd223..9718a5868335 100644
--- a/dom/tv/test/mochitest/head.js
+++ b/dom/tv/test/mochitest/head.js
@@ -1,13 +1,5 @@
"use strict";
-function setupPrefsAndPermissions(callback) {
- setupPrefs(function() {
- SpecialPowers.pushPermissions([
- {"type":"tv", "allow":1, "context":document}
- ], callback);
- });
-}
-
function setupPrefs(callback) {
let xhr = new XMLHttpRequest;
let data;
@@ -31,14 +23,12 @@ function setupPrefs(callback) {
});
}
-function removePrefsAndPermissions(callback) {
- SpecialPowers.popPrefEnv(function() {
- SpecialPowers.popPermissions(callback);
- });
+function removePrefs(callback) {
+ SpecialPowers.popPrefEnv(callback);
}
function prepareTest(callback) {
- removePrefsAndPermissions(function() {
- setupPrefsAndPermissions(callback);
+ removePrefs(function() {
+ setupPrefs(callback);
});
}
diff --git a/dom/tv/test/mochitest/mochitest.ini b/dom/tv/test/mochitest/mochitest.ini
index 60df11a3026f..91a30d2108a2 100644
--- a/dom/tv/test/mochitest/mochitest.ini
+++ b/dom/tv/test/mochitest/mochitest.ini
@@ -4,17 +4,3 @@ support-files =
mock_data.json
[test_tv_non_permitted_app.html]
-[test_tv_permitted_app.html]
-[test_tv_get_tuners.html]
-[test_tv_get_sources.html]
-[test_tv_get_channels.html]
-[test_tv_get_channels_during_scanning.html]
-[test_tv_get_programs.html]
-[test_tv_get_current_program.html]
-[test_tv_set_current_source.html]
-[test_tv_set_invalid_current_source.html]
-[test_tv_set_current_channel.html]
-[test_tv_set_current_channel_during_scanning.html]
-[test_tv_set_invalid_current_channel.html]
-[test_tv_scan_channels_stopped.html]
-[test_tv_scan_channels_completed.html]
diff --git a/dom/tv/test/mochitest/test_tv_get_channels.html b/dom/tv/test/mochitest/test_tv_get_channels.html
index 96b987083d72..3d1c3978d652 100644
--- a/dom/tv/test/mochitest/test_tv_get_channels.html
+++ b/dom/tv/test/mochitest/test_tv_get_channels.html
@@ -2,8 +2,8 @@
Test GetChannels for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html b/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html
index 6d5d31d3c20c..ac2a4ac1df11 100644
--- a/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html
+++ b/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html
@@ -2,8 +2,8 @@
Test an error case for GetChannels during scanning for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_get_current_program.html b/dom/tv/test/mochitest/test_tv_get_current_program.html
index ff82e9fc5baa..266a3dea04f5 100644
--- a/dom/tv/test/mochitest/test_tv_get_current_program.html
+++ b/dom/tv/test/mochitest/test_tv_get_current_program.html
@@ -2,8 +2,8 @@
Test GetCurrentProgram for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_get_programs.html b/dom/tv/test/mochitest/test_tv_get_programs.html
index 2754334cf8ac..b6754a994e47 100644
--- a/dom/tv/test/mochitest/test_tv_get_programs.html
+++ b/dom/tv/test/mochitest/test_tv_get_programs.html
@@ -2,8 +2,8 @@
Test GetPrograms for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_get_sources.html b/dom/tv/test/mochitest/test_tv_get_sources.html
index bbf72c196abd..70a6f075bcaa 100644
--- a/dom/tv/test/mochitest/test_tv_get_sources.html
+++ b/dom/tv/test/mochitest/test_tv_get_sources.html
@@ -2,8 +2,8 @@
Test GetSources for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_get_tuners.html b/dom/tv/test/mochitest/test_tv_get_tuners.html
index 9287cb49756d..15c236c549b2 100644
--- a/dom/tv/test/mochitest/test_tv_get_tuners.html
+++ b/dom/tv/test/mochitest/test_tv_get_tuners.html
@@ -2,8 +2,8 @@
Test GetTuners for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_permitted_app.html b/dom/tv/test/mochitest/test_tv_permitted_app.html
index 24d76c6b0696..8e2445eb9058 100644
--- a/dom/tv/test/mochitest/test_tv_permitted_app.html
+++ b/dom/tv/test/mochitest/test_tv_permitted_app.html
@@ -2,8 +2,8 @@
Test Permitted Application for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_scan_channels_completed.html b/dom/tv/test/mochitest/test_tv_scan_channels_completed.html
index 3e3cdb474a84..2d649c46d589 100644
--- a/dom/tv/test/mochitest/test_tv_scan_channels_completed.html
+++ b/dom/tv/test/mochitest/test_tv_scan_channels_completed.html
@@ -2,8 +2,8 @@
Test channel scanning complete for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html b/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html
index 186280c0f4a8..6cae6d39ce95 100644
--- a/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html
+++ b/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html
@@ -2,8 +2,8 @@
Test StartScanning and StopScanning for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_set_current_channel.html b/dom/tv/test/mochitest/test_tv_set_current_channel.html
index 5dddb2070cd2..f3f7f1400155 100644
--- a/dom/tv/test/mochitest/test_tv_set_current_channel.html
+++ b/dom/tv/test/mochitest/test_tv_set_current_channel.html
@@ -2,8 +2,8 @@
Test SetCurrentChannel for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html b/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html
index 999402d5bc92..088f52b84ac3 100644
--- a/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html
+++ b/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html
@@ -2,8 +2,8 @@
Test an error case for SetCurrentChannel during scanning for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_set_current_source.html b/dom/tv/test/mochitest/test_tv_set_current_source.html
index ebafc89ad29a..4cf1e9c7be70 100644
--- a/dom/tv/test/mochitest/test_tv_set_current_source.html
+++ b/dom/tv/test/mochitest/test_tv_set_current_source.html
@@ -2,8 +2,8 @@
Test SetCurrentSource for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html b/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html
index 680354140dc7..9863c6413f18 100644
--- a/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html
+++ b/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html
@@ -2,8 +2,8 @@
Test an error case for SetCurrentChannel for TV API
-
-
+
+
diff --git a/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html b/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html
index 6836e75ce4c1..5a3713147917 100644
--- a/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html
+++ b/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html
@@ -2,8 +2,8 @@
Test an error case for SetCurrentSource for TV API
-
-
+
+
diff --git a/dom/webidl/AVInputPort.webidl b/dom/webidl/AVInputPort.webidl
index 3cd030ed4ca3..6da3a666e984 100644
--- a/dom/webidl/AVInputPort.webidl
+++ b/dom/webidl/AVInputPort.webidl
@@ -4,6 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[Pref="dom.inputport.enabled", CheckAnyPermissions="inputport", AvailableIn=CertifiedApps]
+[Pref="dom.inputport.enabled", ChromeOnly]
interface AVInputPort : InputPort {
};
diff --git a/dom/webidl/AlarmsManager.webidl b/dom/webidl/AlarmsManager.webidl
index 64e570d5bca1..184fdb741a8b 100644
--- a/dom/webidl/AlarmsManager.webidl
+++ b/dom/webidl/AlarmsManager.webidl
@@ -8,8 +8,8 @@
[NavigatorProperty="mozAlarms",
JSImplementation="@mozilla.org/alarmsManager;1",
- CheckAnyPermissions="alarms",
- Pref="dom.mozAlarms.enabled"]
+ Pref="dom.mozAlarms.enabled",
+ ChromeOnly]
interface AlarmsManager {
DOMRequest getAll();
[UnsafeInPrerendering]
diff --git a/dom/webidl/Apps.webidl b/dom/webidl/Apps.webidl
index 3fd2e8606fe4..9bf65f5d61e9 100644
--- a/dom/webidl/Apps.webidl
+++ b/dom/webidl/Apps.webidl
@@ -22,9 +22,9 @@ enum LocaleResourceType {
};
[NoInterfaceObject, NavigatorProperty="mozApps",
- JSImplementation="@mozilla.org/webapps;1"]
+ JSImplementation="@mozilla.org/webapps;1",
+ ChromeOnly]
interface DOMApplicationsRegistry {
- [CheckAnyPermissions="webapps-manage homescreen-webapps-manage"]
readonly attribute DOMApplicationsManager mgmt;
DOMRequest install(DOMString url, optional InstallParameters params);
DOMRequest installPackage(DOMString url, optional InstallParameters params);
@@ -105,21 +105,16 @@ interface DOMApplication : EventTarget {
};
[JSImplementation="@mozilla.org/webapps/manager;1",
- ChromeOnly,
- CheckAnyPermissions="webapps-manage homescreen-webapps-manage"]
+ ChromeOnly]
interface DOMApplicationsManager : EventTarget {
DOMRequest getAll();
- [CheckAnyPermissions="webapps-manage"]
void applyDownload(DOMApplication app);
DOMRequest uninstall(DOMApplication app);
- [CheckAnyPermissions="webapps-manage"]
Promise import(Blob blob);
- [CheckAnyPermissions="webapps-manage"]
Promise extractManifest(Blob blob);
- [CheckAnyPermissions="webapps-manage"]
void setEnabled(DOMApplication app, boolean state);
Promise getIcon(DOMApplication app, DOMString iconID,
optional DOMString entryPoint);
diff --git a/dom/webidl/AudioChannelManager.webidl b/dom/webidl/AudioChannelManager.webidl
index a706596c3e1e..86bfd65daf5c 100644
--- a/dom/webidl/AudioChannelManager.webidl
+++ b/dom/webidl/AudioChannelManager.webidl
@@ -32,6 +32,6 @@ interface AudioChannelManager : EventTarget {
[Pure, Cached, Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="system-app-only-audio-channels-in-app"]
+ ChromeOnly]
readonly attribute sequence allowedAudioChannels;
};
diff --git a/dom/webidl/BeforeAfterKeyboardEvent.webidl b/dom/webidl/BeforeAfterKeyboardEvent.webidl
index 6c55b4c680bf..32c582f17705 100644
--- a/dom/webidl/BeforeAfterKeyboardEvent.webidl
+++ b/dom/webidl/BeforeAfterKeyboardEvent.webidl
@@ -6,8 +6,8 @@
[Constructor(DOMString typeArg,
optional BeforeAfterKeyboardEventInit eventInitDict),
- CheckAnyPermissions="embed-apps before-after-keyboard-event",
- Pref="dom.beforeAfterKeyboardEvent.enabled"]
+ Pref="dom.beforeAfterKeyboardEvent.enabled",
+ ChromeOnly]
interface BeforeAfterKeyboardEvent : KeyboardEvent
{
// The valid value of embeddedCancelled is:
diff --git a/dom/webidl/BluetoothAdapter.webidl b/dom/webidl/BluetoothAdapter.webidl
index c0d0d3b41785..bb34d9742ecb 100644
--- a/dom/webidl/BluetoothAdapter.webidl
+++ b/dom/webidl/BluetoothAdapter.webidl
@@ -32,17 +32,15 @@ dictionary MediaPlayStatus
DOMString playStatus = "";
};
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothAdapter : EventTarget {
readonly attribute BluetoothAdapterState state;
- [AvailableIn=CertifiedApps]
readonly attribute DOMString address;
readonly attribute DOMString name;
readonly attribute boolean discoverable;
readonly attribute boolean discovering;
readonly attribute BluetoothGattServer? gattServer;
- [AvailableIn=CertifiedApps]
readonly attribute BluetoothPairingListener? pairingReqs;
// Fired when attribute(s) of BluetoothAdapter changed
@@ -109,12 +107,12 @@ interface BluetoothAdapter : EventTarget {
* Several onattributechanged events would be triggered during processing the
* request, and the last one indicates adapter.state becomes enabled/disabled.
*/
- [NewObject, AvailableIn=CertifiedApps]
+ [NewObject]
Promise enable();
- [NewObject, AvailableIn=CertifiedApps]
+ [NewObject]
Promise disable();
- [NewObject, AvailableIn=CertifiedApps]
+ [NewObject]
Promise setName(DOMString name);
[NewObject]
Promise setDiscoverable(boolean discoverable);
@@ -144,7 +142,7 @@ interface BluetoothAdapter : EventTarget {
Func="mozilla::dom::bluetooth::BluetoothManager::B2GGattClientEnabled"]
Promise stopLeScan(BluetoothDiscoveryHandle discoveryHandle);
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest getConnectedDevices(unsigned short serviceUuid);
/**
@@ -164,26 +162,26 @@ interface BluetoothAdapter : EventTarget {
* @param device Remote device
* @param profile 2-octets service UUID. This is optional.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest connect(BluetoothDevice device, optional unsigned short serviceUuid);
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest disconnect(BluetoothDevice device, optional unsigned short serviceUuid);
// One device can only send one file at a time
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest sendFile(DOMString deviceAddress, Blob blob);
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest stopSendingFile(DOMString deviceAddress);
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest confirmReceivingFile(DOMString deviceAddress, boolean confirmation);
// Connect/Disconnect SCO (audio) connection
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest connectSco();
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest disconnectSco();
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest isScoConnected();
/**
@@ -196,17 +194,17 @@ interface BluetoothAdapter : EventTarget {
*
* For more information please refer to bug 912005 and 925638.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest answerWaitingCall();
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest ignoreWaitingCall();
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest toggleCalls();
// AVRCP 1.3 methods
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest sendMediaMetaData(optional MediaMetaData mediaMetaData);
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest sendMediaPlayStatus(optional MediaPlayStatus mediaPlayStatus);
};
diff --git a/dom/webidl/BluetoothAdapterEvent.webidl b/dom/webidl/BluetoothAdapterEvent.webidl
index 3b029225a923..b8753a9f6f3b 100644
--- a/dom/webidl/BluetoothAdapterEvent.webidl
+++ b/dom/webidl/BluetoothAdapterEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type, optional BluetoothAdapterEventInit eventInitDict)]
interface BluetoothAdapterEvent : Event
{
diff --git a/dom/webidl/BluetoothAttributeEvent.webidl b/dom/webidl/BluetoothAttributeEvent.webidl
index c8bc60e7ec6c..89f63e872b63 100644
--- a/dom/webidl/BluetoothAttributeEvent.webidl
+++ b/dom/webidl/BluetoothAttributeEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothAttributeEventInit eventInitDict)]
interface BluetoothAttributeEvent : Event
diff --git a/dom/webidl/BluetoothClassOfDevice.webidl b/dom/webidl/BluetoothClassOfDevice.webidl
index 23f13a803171..c89ed4b7f859 100644
--- a/dom/webidl/BluetoothClassOfDevice.webidl
+++ b/dom/webidl/BluetoothClassOfDevice.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothClassOfDevice
{
/**
diff --git a/dom/webidl/BluetoothDevice.webidl b/dom/webidl/BluetoothDevice.webidl
index 06646784fe65..fa90313a8d99 100644
--- a/dom/webidl/BluetoothDevice.webidl
+++ b/dom/webidl/BluetoothDevice.webidl
@@ -4,7 +4,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothDevice : EventTarget
{
readonly attribute DOMString address;
diff --git a/dom/webidl/BluetoothDeviceEvent.webidl b/dom/webidl/BluetoothDeviceEvent.webidl
index e05cdac70ff8..987071430f04 100644
--- a/dom/webidl/BluetoothDeviceEvent.webidl
+++ b/dom/webidl/BluetoothDeviceEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type, optional BluetoothDeviceEventInit eventInitDict)]
interface BluetoothDeviceEvent : Event
{
diff --git a/dom/webidl/BluetoothDiscoveryHandle.webidl b/dom/webidl/BluetoothDiscoveryHandle.webidl
index fab14bf1d4dc..ca23f1528afa 100644
--- a/dom/webidl/BluetoothDiscoveryHandle.webidl
+++ b/dom/webidl/BluetoothDiscoveryHandle.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothDiscoveryHandle : EventTarget {
attribute EventHandler ondevicefound;
};
diff --git a/dom/webidl/BluetoothGatt.webidl b/dom/webidl/BluetoothGatt.webidl
index ddc9260d9097..83d672beb4b0 100644
--- a/dom/webidl/BluetoothGatt.webidl
+++ b/dom/webidl/BluetoothGatt.webidl
@@ -9,7 +9,7 @@
* BluetoothGatt interface is exposed only if
* "dom.bluetooth.webbluetooth.enabled" preference is false.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Func="mozilla::dom::bluetooth::BluetoothManager::B2GGattClientEnabled"]
interface BluetoothGatt : EventTarget
{
diff --git a/dom/webidl/BluetoothGattAttributeEvent.webidl b/dom/webidl/BluetoothGattAttributeEvent.webidl
index 73c581d56169..923308cad31c 100644
--- a/dom/webidl/BluetoothGattAttributeEvent.webidl
+++ b/dom/webidl/BluetoothGattAttributeEvent.webidl
@@ -6,7 +6,7 @@
[Constructor(DOMString type,
optional BluetoothGattAttributeEventInit eventInitDict),
- CheckAnyPermissions="bluetooth"]
+ ChromeOnly]
interface BluetoothGattAttributeEvent : Event
{
readonly attribute DOMString address;
diff --git a/dom/webidl/BluetoothGattCharacteristic.webidl b/dom/webidl/BluetoothGattCharacteristic.webidl
index 0a59c9f4758d..9568c119564f 100644
--- a/dom/webidl/BluetoothGattCharacteristic.webidl
+++ b/dom/webidl/BluetoothGattCharacteristic.webidl
@@ -33,7 +33,7 @@ dictionary GattPermissions
* provided by a local GATT server, or in the client role as a characteristic
* provided by a remote GATT server.
*/
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothGattCharacteristic
{
readonly attribute BluetoothGattService service;
diff --git a/dom/webidl/BluetoothGattCharacteristicEvent.webidl b/dom/webidl/BluetoothGattCharacteristicEvent.webidl
index 1b117bc447bd..d7a205e0cb50 100644
--- a/dom/webidl/BluetoothGattCharacteristicEvent.webidl
+++ b/dom/webidl/BluetoothGattCharacteristicEvent.webidl
@@ -9,7 +9,7 @@
* BluetoothGattCharacteristicEvent interface is exposed only if
* "dom.bluetooth.webbluetooth.enabled" preference is false.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Func="mozilla::dom::bluetooth::BluetoothManager::B2GGattClientEnabled",
Constructor(DOMString type,
optional BluetoothGattCharacteristicEventInit eventInitDict)]
diff --git a/dom/webidl/BluetoothGattDescriptor.webidl b/dom/webidl/BluetoothGattDescriptor.webidl
index e37f877c6ea1..6913b10c6695 100644
--- a/dom/webidl/BluetoothGattDescriptor.webidl
+++ b/dom/webidl/BluetoothGattDescriptor.webidl
@@ -9,7 +9,7 @@
* by a local GATT server, or in the client role as a descriptor provided by a
* remote GATT server.
*/
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothGattDescriptor
{
readonly attribute BluetoothGattCharacteristic characteristic;
diff --git a/dom/webidl/BluetoothGattServer.webidl b/dom/webidl/BluetoothGattServer.webidl
index 071bbdf9a7dd..782ac313b1b2 100644
--- a/dom/webidl/BluetoothGattServer.webidl
+++ b/dom/webidl/BluetoothGattServer.webidl
@@ -66,7 +66,7 @@ dictionary BluetoothAdvertisingData
sequence serviceUuids = [];
};
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothGattServer : EventTarget
{
[Cached, Pure]
diff --git a/dom/webidl/BluetoothGattService.webidl b/dom/webidl/BluetoothGattService.webidl
index f9300e1e382a..43ed906ccdea 100644
--- a/dom/webidl/BluetoothGattService.webidl
+++ b/dom/webidl/BluetoothGattService.webidl
@@ -9,7 +9,7 @@
* local GATT server, or in the client role as a service provided by a remote
* GATT server.
*/
-[CheckAnyPermissions="bluetooth", Constructor(BluetoothGattServiceInit init)]
+[ChromeOnly, Constructor(BluetoothGattServiceInit init)]
interface BluetoothGattService
{
[Cached, Pure]
@@ -51,4 +51,4 @@ dictionary BluetoothGattServiceInit
{
boolean isPrimary = false;
DOMString uuid = "";
-};
\ No newline at end of file
+};
diff --git a/dom/webidl/BluetoothLeDeviceEvent.webidl b/dom/webidl/BluetoothLeDeviceEvent.webidl
index a6e272bf6a01..b5680cfc7881 100644
--- a/dom/webidl/BluetoothLeDeviceEvent.webidl
+++ b/dom/webidl/BluetoothLeDeviceEvent.webidl
@@ -9,7 +9,7 @@
* BluetoothLeDeviceEvent interface is exposed only if
* "dom.bluetooth.webbluetooth.enabled" preference is false.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Func="mozilla::dom::bluetooth::BluetoothManager::B2GGattClientEnabled",
Constructor(DOMString type, optional BluetoothLeDeviceEventInit eventInitDict)]
interface BluetoothLeDeviceEvent : Event
diff --git a/dom/webidl/BluetoothManager.webidl b/dom/webidl/BluetoothManager.webidl
index e8633caed0e9..4381036446c4 100644
--- a/dom/webidl/BluetoothManager.webidl
+++ b/dom/webidl/BluetoothManager.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothManager: EventTarget
{
readonly attribute BluetoothAdapter? defaultAdapter;
diff --git a/dom/webidl/BluetoothMapFolderListingEvent.webidl b/dom/webidl/BluetoothMapFolderListingEvent.webidl
index fa450d4ada93..2ed050b4dff2 100644
--- a/dom/webidl/BluetoothMapFolderListingEvent.webidl
+++ b/dom/webidl/BluetoothMapFolderListingEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothMapFolderListingEventInit eventInitDict)]
interface BluetoothMapFolderListingEvent : Event
diff --git a/dom/webidl/BluetoothMapGetMessageEvent.webidl b/dom/webidl/BluetoothMapGetMessageEvent.webidl
index b02baaf8846d..115df79489d1 100644
--- a/dom/webidl/BluetoothMapGetMessageEvent.webidl
+++ b/dom/webidl/BluetoothMapGetMessageEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothMapGetMessageEventInit eventInitDict)]
interface BluetoothMapGetMessageEvent : Event
diff --git a/dom/webidl/BluetoothMapMessageUpdateEvent.webidl b/dom/webidl/BluetoothMapMessageUpdateEvent.webidl
index d848e04d76a9..d29d1526f21e 100644
--- a/dom/webidl/BluetoothMapMessageUpdateEvent.webidl
+++ b/dom/webidl/BluetoothMapMessageUpdateEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothMapMessageUpdateEventInit eventInitDict)]
interface BluetoothMapMessageUpdateEvent : Event
diff --git a/dom/webidl/BluetoothMapMessagesListingEvent.webidl b/dom/webidl/BluetoothMapMessagesListingEvent.webidl
index 98762d4bd97d..69403770deb4 100644
--- a/dom/webidl/BluetoothMapMessagesListingEvent.webidl
+++ b/dom/webidl/BluetoothMapMessagesListingEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothMapMessagesListingEventInit eventInitDict)]
interface BluetoothMapMessagesListingEvent : Event
diff --git a/dom/webidl/BluetoothMapRequestHandle.webidl b/dom/webidl/BluetoothMapRequestHandle.webidl
index d5fa6fba2cf2..ec98f9fc82ad 100644
--- a/dom/webidl/BluetoothMapRequestHandle.webidl
+++ b/dom/webidl/BluetoothMapRequestHandle.webidl
@@ -3,21 +3,21 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothMapRequestHandle
{
/**
* Reply to Folder-Listing object for MAP request. The Promise will be
* rejected if the MAP request operation fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
Promise replyToFolderListing(long masId, DOMString folders);
/**
* Reply the Messages-Listing object to the MAP request. The Promise will
* be rejected if the MAP request operation fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
Promise replyToMessagesListing(
long masId,
Blob messageslisting,
@@ -29,27 +29,27 @@ interface BluetoothMapRequestHandle
* Reply GetMessage object to the MAP request. The Promise will be rejected
* if the MAP request operation fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
Promise replyToGetMessage(long masId, Blob bmessage);
/**
* Reply SetMessage object to the MAP request. The Promise will be rejected
* if the MAP request operation fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
Promise replyToSetMessageStatus(long masId, boolean status);
/**
* Reply SendMessage request to the MAP request. The Promise will be rejected
* if the MAP request operation fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
Promise replyToSendMessage(long masId, DOMString handleId, boolean status);
/**
* Reply Message-Update object to the MAP request. The Promise will be
* rejected if the MAP request operation fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
Promise replyToMessageUpdate(long masId, boolean status);
};
diff --git a/dom/webidl/BluetoothMapSendMessageEvent.webidl b/dom/webidl/BluetoothMapSendMessageEvent.webidl
index b4970470d795..306c63b9d52c 100644
--- a/dom/webidl/BluetoothMapSendMessageEvent.webidl
+++ b/dom/webidl/BluetoothMapSendMessageEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothMapSendMessageEventInit eventInitDict)]
interface BluetoothMapSendMessageEvent : Event
diff --git a/dom/webidl/BluetoothMapSetMessageStatusEvent.webidl b/dom/webidl/BluetoothMapSetMessageStatusEvent.webidl
index b5ea966d615c..11b147d492d6 100644
--- a/dom/webidl/BluetoothMapSetMessageStatusEvent.webidl
+++ b/dom/webidl/BluetoothMapSetMessageStatusEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothMapSetMessageStatusEventInit eventInitDict)]
interface BluetoothMapSetMessageStatusEvent : Event
diff --git a/dom/webidl/BluetoothObexAuthEvent.webidl b/dom/webidl/BluetoothObexAuthEvent.webidl
index cb490375cf22..1cb6dba0631d 100644
--- a/dom/webidl/BluetoothObexAuthEvent.webidl
+++ b/dom/webidl/BluetoothObexAuthEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothObexAuthEventInit eventInitDict)]
interface BluetoothObexAuthEvent : Event
diff --git a/dom/webidl/BluetoothObexAuthHandle.webidl b/dom/webidl/BluetoothObexAuthHandle.webidl
index 576c64acef37..c76e17004f98 100644
--- a/dom/webidl/BluetoothObexAuthHandle.webidl
+++ b/dom/webidl/BluetoothObexAuthHandle.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothObexAuthHandle
{
/**
diff --git a/dom/webidl/BluetoothPairingEvent.webidl b/dom/webidl/BluetoothPairingEvent.webidl
index d9bb96597055..fb4e7ea32d50 100644
--- a/dom/webidl/BluetoothPairingEvent.webidl
+++ b/dom/webidl/BluetoothPairingEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothPairingEventInit eventInitDict)]
interface BluetoothPairingEvent : Event
diff --git a/dom/webidl/BluetoothPairingHandle.webidl b/dom/webidl/BluetoothPairingHandle.webidl
index 51fc4848775f..87489a16331e 100644
--- a/dom/webidl/BluetoothPairingHandle.webidl
+++ b/dom/webidl/BluetoothPairingHandle.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothPairingHandle
{
/**
diff --git a/dom/webidl/BluetoothPairingListener.webidl b/dom/webidl/BluetoothPairingListener.webidl
index 549c71f5ee31..4eac58d9655e 100644
--- a/dom/webidl/BluetoothPairingListener.webidl
+++ b/dom/webidl/BluetoothPairingListener.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[AvailableIn=CertifiedApps, CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothPairingListener: EventTarget
{
attribute EventHandler ondisplaypasskeyreq;
diff --git a/dom/webidl/BluetoothPbapRequestHandle.webidl b/dom/webidl/BluetoothPbapRequestHandle.webidl
index 2dbe3932abb8..0c218de61bf4 100644
--- a/dom/webidl/BluetoothPbapRequestHandle.webidl
+++ b/dom/webidl/BluetoothPbapRequestHandle.webidl
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-[CheckAnyPermissions="bluetooth"]
+[ChromeOnly]
interface BluetoothPbapRequestHandle
{
/**
@@ -11,7 +11,7 @@ interface BluetoothPbapRequestHandle
* callback if the PBAP request type is not 'pullvcardentryreq' or operation
* fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest replyTovCardPulling(Blob vcardObject);
/**
@@ -19,7 +19,7 @@ interface BluetoothPbapRequestHandle
* callback if the PBAP request type is not 'pullphonebookreq' or operation
* fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest replyToPhonebookPulling(Blob vcardObject,
unsigned long long phonebookSize);
/**
@@ -27,7 +27,7 @@ interface BluetoothPbapRequestHandle
* callback if the PBAP request type is not 'pullvcardlistingreq' or operation
* fails.
*/
- [NewObject, Throws, AvailableIn=CertifiedApps]
+ [NewObject, Throws]
DOMRequest replyTovCardListing(Blob vcardObject,
unsigned long long phonebookSize);
};
diff --git a/dom/webidl/BluetoothPhonebookPullingEvent.webidl b/dom/webidl/BluetoothPhonebookPullingEvent.webidl
index 3ab580b00d09..c36022ca3060 100644
--- a/dom/webidl/BluetoothPhonebookPullingEvent.webidl
+++ b/dom/webidl/BluetoothPhonebookPullingEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothPhonebookPullingEventInit eventInitDict)]
interface BluetoothPhonebookPullingEvent : Event
diff --git a/dom/webidl/BluetoothStatusChangedEvent.webidl b/dom/webidl/BluetoothStatusChangedEvent.webidl
index 81198d22c1e4..87afe32e0116 100644
--- a/dom/webidl/BluetoothStatusChangedEvent.webidl
+++ b/dom/webidl/BluetoothStatusChangedEvent.webidl
@@ -6,7 +6,7 @@
[Constructor(DOMString type,
optional BluetoothStatusChangedEventInit eventInitDict),
- CheckAnyPermissions="bluetooth"]
+ ChromeOnly]
interface BluetoothStatusChangedEvent : Event
{
readonly attribute DOMString address;
diff --git a/dom/webidl/BluetoothUUID.webidl b/dom/webidl/BluetoothUUID.webidl
index 57d854261bbf..ad8fadfc6e94 100644
--- a/dom/webidl/BluetoothUUID.webidl
+++ b/dom/webidl/BluetoothUUID.webidl
@@ -13,7 +13,7 @@ typedef (DOMString or unsigned long) BluetoothServiceUUID;
typedef (DOMString or unsigned long) BluetoothCharacteristicUUID;
typedef (DOMString or unsigned long) BluetoothDescriptorUUID;
-[Pref="dom.bluetooth.webbluetooth.enable", CheckAnyPermissions="bluetooth"]
+[Pref="dom.bluetooth.webbluetooth.enable", ChromeOnly]
interface BluetoothUUID
{
[Throws]
diff --git a/dom/webidl/BluetoothVCardListingEvent.webidl b/dom/webidl/BluetoothVCardListingEvent.webidl
index 21eb79e46280..4a0737b08f42 100644
--- a/dom/webidl/BluetoothVCardListingEvent.webidl
+++ b/dom/webidl/BluetoothVCardListingEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothVCardListingEventInit eventInitDict)]
interface BluetoothVCardListingEvent : Event
diff --git a/dom/webidl/BluetoothVCardPullingEvent.webidl b/dom/webidl/BluetoothVCardPullingEvent.webidl
index ac54ab23af24..bc22a06e5dd4 100644
--- a/dom/webidl/BluetoothVCardPullingEvent.webidl
+++ b/dom/webidl/BluetoothVCardPullingEvent.webidl
@@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[CheckAnyPermissions="bluetooth",
+[ChromeOnly,
Constructor(DOMString type,
optional BluetoothVCardPullingEventInit eventInitDict)]
interface BluetoothVCardPullingEvent : Event
diff --git a/dom/webidl/BrowserElement.webidl b/dom/webidl/BrowserElement.webidl
index 3ec8fcf14ac6..322dd590f0ac 100644
--- a/dom/webidl/BrowserElement.webidl
+++ b/dom/webidl/BrowserElement.webidl
@@ -30,32 +30,32 @@ BrowserElement implements BrowserElementPrivileged;
interface BrowserElementCommon {
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser embed-widgets"]
+ ChromeOnly]
void setVisible(boolean visible);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser embed-widgets"]
+ ChromeOnly]
DOMRequest getVisible();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser embed-widgets"]
+ ChromeOnly]
void setActive(boolean active);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser embed-widgets"]
+ ChromeOnly]
boolean getActive();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser embed-widgets"]
+ ChromeOnly]
void addNextPaintListener(BrowserElementNextPaintEventCallback listener);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser embed-widgets"]
+ ChromeOnly]
void removeNextPaintListener(BrowserElementNextPaintEventCallback listener);
};
@@ -63,7 +63,7 @@ interface BrowserElementCommon {
interface BrowserElementPrivileged {
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void sendMouseEvent(DOMString type,
unsigned long x,
unsigned long y,
@@ -74,7 +74,7 @@ interface BrowserElementPrivileged {
[Throws,
Pref="dom.mozBrowserFramesEnabled",
Func="TouchEvent::PrefEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void sendTouchEvent(DOMString type,
sequence identifiers,
sequence x,
@@ -88,96 +88,96 @@ interface BrowserElementPrivileged {
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void goBack();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void goForward();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void reload(optional boolean hardReload = false);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void stop();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest download(DOMString url,
optional BrowserElementDownloadOptions options);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest purgeHistory();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest getScreenshot([EnforceRange] unsigned long width,
[EnforceRange] unsigned long height,
optional DOMString mimeType="");
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void zoom(float zoom);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest getCanGoBack();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest getCanGoForward();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest getContentDimensions();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAllPermissions="browser input-manage"]
+ ChromeOnly]
DOMRequest setInputMethodActive(boolean isActive);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAllPermissions="browser nfc-manager"]
+ ChromeOnly]
void setNFCFocus(boolean isFocus);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void findAll(DOMString searchString, BrowserFindCaseSensitivity caseSensitivity);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void findNext(BrowserFindDirection direction);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void clearMatch();
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAllPermissions="browser browser:universalxss"]
+ ChromeOnly]
DOMRequest executeScript(DOMString script,
optional BrowserElementExecuteScriptOptions options);
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAllPermissions="browser"]
+ ChromeOnly]
DOMRequest getWebManifest();
};
diff --git a/dom/webidl/BrowserElementAudioChannel.webidl b/dom/webidl/BrowserElementAudioChannel.webidl
index 8075dac6b28b..55dbe3fb48e5 100644
--- a/dom/webidl/BrowserElementAudioChannel.webidl
+++ b/dom/webidl/BrowserElementAudioChannel.webidl
@@ -5,7 +5,7 @@
*/
[Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
interface BrowserElementAudioChannel : EventTarget {
readonly attribute AudioChannel name;
@@ -32,7 +32,7 @@ interface BrowserElementAudioChannel : EventTarget {
partial interface BrowserElementPrivileged {
[Pure, Cached, Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
readonly attribute sequence allowedAudioChannels;
/**
@@ -40,7 +40,7 @@ partial interface BrowserElementPrivileged {
*/
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void mute();
/**
@@ -48,7 +48,7 @@ partial interface BrowserElementPrivileged {
*/
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void unmute();
/**
@@ -56,7 +56,7 @@ partial interface BrowserElementPrivileged {
*/
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest getMuted();
/**
@@ -64,7 +64,7 @@ partial interface BrowserElementPrivileged {
*/
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
void setVolume(float volume);
/**
@@ -72,6 +72,6 @@ partial interface BrowserElementPrivileged {
*/
[Throws,
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser"]
+ ChromeOnly]
DOMRequest getVolume();
};
diff --git a/dom/webidl/BrowserElementProxy.webidl b/dom/webidl/BrowserElementProxy.webidl
index 6bd91065949e..6f6fb5ebed6f 100644
--- a/dom/webidl/BrowserElementProxy.webidl
+++ b/dom/webidl/BrowserElementProxy.webidl
@@ -8,7 +8,7 @@
JSImplementation="@mozilla.org/dom/browser-element-proxy;1",
NavigatorProperty="mozBrowserElementProxy",
Pref="dom.mozBrowserFramesEnabled",
- CheckAnyPermissions="browser:embedded-system-app"]
+ ChromeOnly]
interface BrowserElementProxy : EventTarget {
};
BrowserElementProxy implements BrowserElementCommon;
diff --git a/dom/webidl/ChromeNotifications.webidl b/dom/webidl/ChromeNotifications.webidl
index ad7a9de013f6..5283e23027e5 100644
--- a/dom/webidl/ChromeNotifications.webidl
+++ b/dom/webidl/ChromeNotifications.webidl
@@ -6,7 +6,7 @@
[JSImplementation="@mozilla.org/mozChromeNotifications;1",
NavigatorProperty="mozChromeNotifications",
- AvailableIn="CertifiedApps"]
+ ChromeOnly]
interface ChromeNotifications {
void mozResendAllNotifications(ResendCallback resendCallback);
};
diff --git a/dom/webidl/Contacts.webidl b/dom/webidl/Contacts.webidl
index 1755df98e862..c4c47e100bf9 100644
--- a/dom/webidl/Contacts.webidl
+++ b/dom/webidl/Contacts.webidl
@@ -59,7 +59,7 @@ dictionary ContactProperties {
[Constructor(optional ContactProperties properties),
JSImplementation="@mozilla.org/contact;1",
- CheckAnyPermissions="contacts-read contacts-write contacts-create"]
+ ChromeOnly]
interface mozContact {
attribute DOMString id;
readonly attribute Date? published;
@@ -118,7 +118,7 @@ dictionary ContactFindOptions : ContactFindSortOptions {
[NoInterfaceObject, NavigatorProperty="mozContacts",
JSImplementation="@mozilla.org/contactManager;1",
- CheckAnyPermissions="contacts-read contacts-write contacts-create"]
+ ChromeOnly]
interface ContactManager : EventTarget {
DOMRequest find(optional ContactFindOptions options);
DOMCursor getAll(optional ContactFindSortOptions options);
diff --git a/dom/webidl/DOMMobileMessageError.webidl b/dom/webidl/DOMMobileMessageError.webidl
index 16926df24ea8..557855d2e186 100644
--- a/dom/webidl/DOMMobileMessageError.webidl
+++ b/dom/webidl/DOMMobileMessageError.webidl
@@ -5,8 +5,7 @@
*/
[Pref="dom.sms.enabled",
- CheckAnyPermissions="sms",
- AvailableIn="CertifiedApps"]
+ ChromeOnly]
interface DOMMobileMessageError : DOMError {
readonly attribute (SmsMessage or MmsMessage) data;
};
diff --git a/dom/webidl/DisplayPortInputPort.webidl b/dom/webidl/DisplayPortInputPort.webidl
index 8d5e78f8b34f..d7a6cac3ca1f 100644
--- a/dom/webidl/DisplayPortInputPort.webidl
+++ b/dom/webidl/DisplayPortInputPort.webidl
@@ -4,6 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[Pref="dom.inputport.enabled", CheckAnyPermissions="inputport", AvailableIn=CertifiedApps]
+[Pref="dom.inputport.enabled", ChromeOnly]
interface DisplayPortInputPort : InputPort {
};
diff --git a/dom/webidl/DownloadEvent.webidl b/dom/webidl/DownloadEvent.webidl
index c2d164c5ae49..8422ba62bb20 100644
--- a/dom/webidl/DownloadEvent.webidl
+++ b/dom/webidl/DownloadEvent.webidl
@@ -6,7 +6,7 @@
[Constructor(DOMString type, optional DownloadEventInit eventInitDict),
Pref="dom.mozDownloads.enabled",
- CheckAnyPermissions="downloads"]
+ ChromeOnly]
interface DownloadEvent : Event
{
readonly attribute DOMDownload? download;
diff --git a/dom/webidl/Downloads.webidl b/dom/webidl/Downloads.webidl
index 7519101c8695..ff840eac6c13 100644
--- a/dom/webidl/Downloads.webidl
+++ b/dom/webidl/Downloads.webidl
@@ -21,7 +21,7 @@ enum DownloadState {
NavigatorProperty="mozDownloadManager",
JSImplementation="@mozilla.org/downloads/manager;1",
Pref="dom.mozDownloads.enabled",
- CheckAnyPermissions="downloads"]
+ ChromeOnly]
interface DOMDownloadManager : EventTarget {
// This promise returns an array of downloads with all the current
// download objects.
@@ -56,7 +56,6 @@ interface DOMDownloadManager : EventTarget {
// be marked as such because it is not followed by a required argument. The
// promise will be rejected if the dictionary is omitted or the specified
// file does not exist on disk.
- [AvailableIn=CertifiedApps]
Promise adoptDownload(optional AdoptDownloadDict download);
// Fires when a new download starts.
@@ -65,7 +64,7 @@ interface DOMDownloadManager : EventTarget {
[JSImplementation="@mozilla.org/downloads/download;1",
Pref="dom.mozDownloads.enabled",
- CheckAnyPermissions="downloads"]
+ ChromeOnly]
interface DOMDownload : EventTarget {
// The full size of the resource.
readonly attribute long long totalBytes;
diff --git a/dom/webidl/HDMIInputPort.webidl b/dom/webidl/HDMIInputPort.webidl
index f6e5bfcd0a8b..9ec77af69f0c 100644
--- a/dom/webidl/HDMIInputPort.webidl
+++ b/dom/webidl/HDMIInputPort.webidl
@@ -4,6 +4,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-[Pref="dom.inputport.enabled", CheckAnyPermissions="inputport", AvailableIn=CertifiedApps]
+[Pref="dom.inputport.enabled", ChromeOnly]
interface HDMIInputPort : InputPort {
};
diff --git a/dom/webidl/IccCardLockError.webidl b/dom/webidl/IccCardLockError.webidl
index e639bfab7b5e..434491582b73 100644
--- a/dom/webidl/IccCardLockError.webidl
+++ b/dom/webidl/IccCardLockError.webidl
@@ -5,8 +5,7 @@
[Constructor(DOMString errorName, short retryCount),
Pref="dom.icc.enabled",
- CheckAnyPermissions="mobileconnection",
- AvailableIn="CertifiedApps"]
+ ChromeOnly]
interface IccCardLockError : DOMError {
readonly attribute short retryCount;
};
diff --git a/dom/webidl/IccChangeEvent.webidl b/dom/webidl/IccChangeEvent.webidl
index 3a7e2644baa7..f24eff6f7c3b 100644
--- a/dom/webidl/IccChangeEvent.webidl
+++ b/dom/webidl/IccChangeEvent.webidl
@@ -5,8 +5,7 @@
*/
[Pref="dom.icc.enabled",
- CheckAnyPermissions="mobileconnection",
- AvailableIn="CertifiedApps",
+ ChromeOnly,
Constructor(DOMString type, optional IccChangeEventInit eventInitDict)]
interface IccChangeEvent : Event
{
diff --git a/dom/webidl/InputMethod.webidl b/dom/webidl/InputMethod.webidl
index f53c7fecd9bd..ca22dcc1b692 100644
--- a/dom/webidl/InputMethod.webidl
+++ b/dom/webidl/InputMethod.webidl
@@ -16,7 +16,7 @@
[JSImplementation="@mozilla.org/b2g-inputmethod;1",
NavigatorProperty="mozInputMethod",
Pref="dom.mozInputMethod.enabled",
- CheckAnyPermissions="input input-manage"]
+ ChromeOnly]
interface MozInputMethod : EventTarget {
/**
* Activate or decactive current API instance.
@@ -39,7 +39,6 @@ interface MozInputMethod : EventTarget {
* Note that if the app saves the original context, it might get
* void; implementation decides when to void the input context.
*/
- [CheckAnyPermissions="input"]
attribute EventHandler oninputcontextchange;
/**
@@ -47,7 +46,6 @@ interface MozInputMethod : EventTarget {
* allow to mutate. This attribute should be null when there is no
* text field currently focused.
*/
- [CheckAnyPermissions="input"]
readonly attribute MozInputContext? inputcontext;
/**
@@ -57,7 +55,6 @@ interface MozInputMethod : EventTarget {
* manifest. If an input of the same id is already declared, the info of that
* input will be updated.
*/
- [CheckAnyPermissions="input"]
Promise addInput(DOMString inputId,
MozInputMethodInputManifest inputManifest);
@@ -68,14 +65,12 @@ interface MozInputMethod : EventTarget {
* manifest. Silently resolves if the input is not previously declared;
* rejects if attempt to remove a statically declared input.
*/
- [CheckAnyPermissions="input"]
Promise removeInput(DOMString id);
/**
* Remove focus from the current input, usable by Gaia System app, globally,
* regardless of the current focus state.
*/
- [CheckAnyPermissions="input-manage"]
void removeFocus();
/**
@@ -90,7 +85,6 @@ interface MozInputMethod : EventTarget {
* If the value passed in parameter isn't valid (in the term of HTML5
* Forms Validation), the value will simply be ignored by the element.
*/
- [CheckAnyPermissions="input-manage"]
void setValue(DOMString value);
/**
@@ -101,7 +95,6 @@ interface MozInputMethod : EventTarget {
* If this method is called for a select that does not support multiple
* selection the previous element will be unselected.
*/
- [CheckAnyPermissions="input-manage"]
void setSelectedOption(long index);
/**
@@ -110,7 +103,6 @@ interface MozInputMethod : EventTarget {
* If this method is called for a