From 25fbf67b66b9c689482fd07721a5be23f861a188 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Thu, 10 Mar 2016 14:45:59 +0100
Subject: [PATCH] Backed out changeset 878c54ec3954 (bug 1250453)

---
 b2g/chrome/content/shell.js                     |  1 +
 .../mochitest/test_aboutserviceworkers.html     |  1 +
 .../shared/apps/tests/test_webapps_actor.html   |  1 +
 devtools/shared/apps/tests/unit/head_apps.js    |  3 +++
 .../tests/mochi/test_dev_mode_activity.html     |  2 ++
 .../mochi/test_same_name_multiple_filters.html  |  2 ++
 dom/apps/Webapps.jsm                            |  1 +
 dom/apps/tests/file_bug_779982.js               |  1 +
 dom/apps/tests/file_test_widget.js              |  1 +
 dom/apps/tests/head.js                          | 13 +++++++++++++
 dom/apps/tests/test_app_addons.html             |  1 +
 dom/apps/tests/test_app_blocklist.html          |  2 ++
 dom/apps/tests/test_app_enabled.html            |  2 ++
 dom/apps/tests/test_app_update.html             |  1 +
 dom/apps/tests/test_bug_1168300.html            |  1 +
 dom/apps/tests/test_bug_765063.xul              |  2 ++
 dom/apps/tests/test_bug_771294.xul              |  2 ++
 dom/apps/tests/test_bug_795164.html             |  1 +
 dom/apps/tests/test_bug_945152.html             |  1 +
 dom/apps/tests/test_checkInstalled.html         |  2 ++
 dom/apps/tests/test_iac.html                    |  1 +
 dom/apps/tests/test_import_export.html          |  2 ++
 dom/apps/tests/test_install_dev_mode.html       |  2 ++
 .../test_install_multiple_apps_origin.html      |  2 ++
 dom/apps/tests/test_install_receipts.html       |  2 ++
 dom/apps/tests/test_langpacks.html              |  1 +
 .../tests/test_marketplace_pkg_install.html     |  1 +
 dom/apps/tests/test_packaged_app_asmjs.html     |  1 +
 dom/apps/tests/test_packaged_app_install.html   |  1 +
 dom/apps/tests/test_packaged_app_update.html    |  1 +
 dom/apps/tests/test_receipt_operations.html     |  2 ++
 dom/apps/tests/test_signed_pkg_install.html     |  1 +
 dom/apps/tests/test_theme_role.html             |  2 ++
 dom/apps/tests/test_third_party_homescreen.html |  2 ++
 dom/apps/tests/test_uninstall_errors.html       |  1 +
 dom/apps/tests/test_web_app_install.html        |  2 ++
 ...serElement_AllowEmbedAppsInNestedOOIframe.js |  2 ++
 .../browserElement_AppFramePermission.js        |  2 ++
 .../browserElement_DisallowEmbedAppsInOOP.js    |  2 ++
 .../browserElement_MultipleAudioChannels.js     |  1 +
 .../mochitest/browserElement_NotifyChannel.js   |  1 +
 .../test_cache_clear_on_app_uninstall.html      |  1 +
 dom/datastore/tests/test_app_install.html       |  1 +
 dom/datastore/tests/test_arrays.html            |  1 +
 dom/datastore/tests/test_basic.html             |  1 +
 dom/datastore/tests/test_basic_worker.html      |  1 +
 dom/datastore/tests/test_bug1008044.html        |  1 +
 dom/datastore/tests/test_bug1058108.html        |  1 +
 dom/datastore/tests/test_bug924104.html         |  1 +
 dom/datastore/tests/test_bug957086.html         |  1 +
 dom/datastore/tests/test_bug976311.html         |  1 +
 dom/datastore/tests/test_bug986056.html         |  1 +
 dom/datastore/tests/test_certifiedApp.html      |  1 +
 dom/datastore/tests/test_changes.html           |  1 +
 dom/datastore/tests/test_duplicate.html         |  1 +
 dom/datastore/tests/test_keys.html              |  1 +
 .../tests/test_notify_system_message.html       |  1 +
 dom/datastore/tests/test_oop.html               |  1 +
 dom/datastore/tests/test_oop_events.html        |  1 +
 dom/datastore/tests/test_readonly.html          |  1 +
 dom/datastore/tests/test_transactions.html      |  1 +
 dom/datastore/tests/test_worker_close.html      |  1 +
 dom/downloads/tests/shim_app_as_test.js         |  1 +
 dom/indexedDB/test/webapp_clearBrowserData.js   |  2 ++
 dom/ipc/tests/test_permission_helper.js         |  2 ++
 dom/messages/test/test_sysmsg_registration.html |  1 +
 dom/requestsync/tests/test_basic_app.html       |  1 +
 dom/security/test/csp/test_bug949549.html       |  1 +
 .../fetch/test_fetch_app_protocol.html          |  1 +
 .../localstorage/test_clear_browser_data.html   |  3 +++
 .../mochitest/notification/NotificationTest.js  |  1 +
 .../test/mochitests/test_web_packaged_app.html  |  1 +
 .../mochitest/tests/SimpleTest/SimpleTest.js    |  1 +
 .../mochitest/tests/SimpleTest/TestRunner.js    |  1 +
 .../content/SpecialPowersObserverAPI.js         |  4 ++++
 .../specialpowers/content/specialpowersAPI.js   | 17 +++++++++++++++++
 76 files changed, 131 insertions(+)

diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js
index b6242629e336..f43657a4b313 100644
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -45,6 +45,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Screenshot",
                                   "resource://gre/modules/Screenshot.jsm");
 
 Cu.import('resource://gre/modules/Webapps.jsm');
+DOMApplicationRegistry.allAppsLaunchable = true;
 
 XPCOMUtils.defineLazyServiceGetter(Services, 'env',
                                    '@mozilla.org/process/environment;1',
diff --git a/b2g/components/test/mochitest/test_aboutserviceworkers.html b/b2g/components/test/mochitest/test_aboutserviceworkers.html
index e4da0a669f01..d30e58f4f652 100644
--- a/b2g/components/test/mochitest/test_aboutserviceworkers.html
+++ b/b2g/components/test/mochitest/test_aboutserviceworkers.html
@@ -204,6 +204,7 @@ function installApp() {
 function setup() {
   info("Setting up");
   return new Promise((resolve, reject) => {
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.pushPrefEnv({"set": [
       ["dom.mozBrowserFramesEnabled", true],
       ["dom.serviceWorkers.exemptFromPerDomainMax", true],
diff --git a/devtools/shared/apps/tests/test_webapps_actor.html b/devtools/shared/apps/tests/test_webapps_actor.html
index d105a55c8fbd..566692b4b55c 100644
--- a/devtools/shared/apps/tests/test_webapps_actor.html
+++ b/devtools/shared/apps/tests/test_webapps_actor.html
@@ -71,6 +71,7 @@ var steps = [
   function() {
     info("== SETUP ==");
     // Set up
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.addPermission("webapps-manage", true, document);
     SpecialPowers.addPermission("browser", true, document);
     SpecialPowers.addPermission("embed-apps", true, document);
diff --git a/devtools/shared/apps/tests/unit/head_apps.js b/devtools/shared/apps/tests/unit/head_apps.js
index 0ca6cdeb2da5..eb3637cb49e3 100644
--- a/devtools/shared/apps/tests/unit/head_apps.js
+++ b/devtools/shared/apps/tests/unit/head_apps.js
@@ -80,7 +80,10 @@ function setup() {
   Components.utils.import("resource://testing-common/AppInfo.jsm");
   updateAppInfo();
 
+  // We have to toggle this flag in order to have apps being listed in getAll
+  // as only launchable apps are returned
   Components.utils.import('resource://gre/modules/Webapps.jsm');
+  DOMApplicationRegistry.allAppsLaunchable = true;
 
   // Enable launch/close method of the webapps actor
   let {WebappsActor} = require("devtools/server/actors/webapps");
diff --git a/dom/activities/tests/mochi/test_dev_mode_activity.html b/dom/activities/tests/mochi/test_dev_mode_activity.html
index 75629fe8bd9c..004649a544af 100644
--- a/dom/activities/tests/mochi/test_dev_mode_activity.html
+++ b/dom/activities/tests/mochi/test_dev_mode_activity.html
@@ -163,6 +163,8 @@ obsService.addObserver(continueTest, "new-activity-registered-failure", false);
   * Test dev mode activity.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/activities/tests/mochi/test_same_name_multiple_filters.html b/dom/activities/tests/mochi/test_same_name_multiple_filters.html
index 2a3f9ba68f3b..89deb72d0206 100644
--- a/dom/activities/tests/mochi/test_same_name_multiple_filters.html
+++ b/dom/activities/tests/mochi/test_same_name_multiple_filters.html
@@ -124,6 +124,8 @@ function continueTest() {
 }
 
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/Webapps.jsm b/dom/apps/Webapps.jsm
index da384bcbe1d1..a9771e663f24 100644
--- a/dom/apps/Webapps.jsm
+++ b/dom/apps/Webapps.jsm
@@ -196,6 +196,7 @@ this.DOMApplicationRegistry = {
   // Path to the webapps.json file where we store the registry data.
   appsFile: null,
   webapps: { },
+  allAppsLaunchable: false,
   _updateHandlers: [ ],
   _pendingUninstalls: {},
   _contentActions: new Map(),
diff --git a/dom/apps/tests/file_bug_779982.js b/dom/apps/tests/file_bug_779982.js
index 6c2fffbb4471..5bc26c6f0f2b 100644
--- a/dom/apps/tests/file_bug_779982.js
+++ b/dom/apps/tests/file_bug_779982.js
@@ -1,4 +1,5 @@
 SimpleTest.waitForExplicitFinish();
+SpecialPowers.setAllAppsLaunchable(true);
 
 var fileTestOnCurrentOrigin = 'http://example.org/tests/dom/apps/tests/file_bug_779982.html';
 
diff --git a/dom/apps/tests/file_test_widget.js b/dom/apps/tests/file_test_widget.js
index d70f182e8ef0..db0f46cc9188 100644
--- a/dom/apps/tests/file_test_widget.js
+++ b/dom/apps/tests/file_test_widget.js
@@ -193,6 +193,7 @@ var tests = [
 
   // No confirmation needed when an app is installed
   function() {
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.autoConfirmAppInstall(() => {
       SpecialPowers.autoConfirmAppUninstall(runTest);
     });
diff --git a/dom/apps/tests/head.js b/dom/apps/tests/head.js
index 662d119a0c2a..ba5a995e46fd 100644
--- a/dom/apps/tests/head.js
+++ b/dom/apps/tests/head.js
@@ -8,6 +8,19 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 function runAll(steps) {
   SimpleTest.waitForExplicitFinish();
 
+  /**
+   * On Mac, apps aren't considered launchable right after they've been
+   * installed because the OS takes some time to detect them (so
+   * nsIMacWebAppUtils::pathForAppWithIdentifier() returns null).
+   * That causes methods like mgmt.getAll() to exclude the app from their
+   * results, even though the app is installed and is in the registry.
+   * See the tests under toolkit/webapps for a viable solution.
+   *
+   * To work around this problem, set allAppsLaunchable to true, which makes
+   * all apps considered as launchable.
+   */
+  SpecialPowers.setAllAppsLaunchable(true);
+
   // Clone the array so we don't modify the original.
   steps = steps.concat();
   function next() {
diff --git a/dom/apps/tests/test_app_addons.html b/dom/apps/tests/test_app_addons.html
index b63eb7b39d04..65ff8cd8b4d8 100644
--- a/dom/apps/tests/test_app_addons.html
+++ b/dom/apps/tests/test_app_addons.html
@@ -104,6 +104,7 @@ function installApp(manifestURL, expectedError) {
 
 function runTest() {
   // Set up.
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.allowUnsignedAddons();
   SpecialPowers.debugUserCustomizations(true);
   SpecialPowers.pushPrefEnv({'set': [
diff --git a/dom/apps/tests/test_app_blocklist.html b/dom/apps/tests/test_app_blocklist.html
index 44c255a4de2b..57fc653377ac 100644
--- a/dom/apps/tests/test_app_blocklist.html
+++ b/dom/apps/tests/test_app_blocklist.html
@@ -113,6 +113,8 @@ function installApp(manifestURL) {
   * Test blocking of an add-on.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_app_enabled.html b/dom/apps/tests/test_app_enabled.html
index 8c0cdc76968a..3e82f2c6a95d 100644
--- a/dom/apps/tests/test_app_enabled.html
+++ b/dom/apps/tests/test_app_enabled.html
@@ -53,6 +53,8 @@ SimpleTest.waitForExplicitFinish();
   * Flip the `enabled` state of an app back and forth.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_app_update.html b/dom/apps/tests/test_app_update.html
index 783edfbe2a62..cddb0329c2fa 100644
--- a/dom/apps/tests/test_app_update.html
+++ b/dom/apps/tests/test_app_update.html
@@ -61,6 +61,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
 
   function runTest() {
     // Set up.
+    SpecialPowers.setAllAppsLaunchable(true);
     // Test Bug 927699 - navigator.mozApps.install(url) lets NS_ERROR_FAILURE
     //                   onto the web
     var request = navigator.mozApps.install("");
diff --git a/dom/apps/tests/test_bug_1168300.html b/dom/apps/tests/test_bug_1168300.html
index 02ffe846310b..eb79b1121542 100644
--- a/dom/apps/tests/test_bug_1168300.html
+++ b/dom/apps/tests/test_bug_1168300.html
@@ -40,6 +40,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1168300
 
   function runTest() {
     // Set up.
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
diff --git a/dom/apps/tests/test_bug_765063.xul b/dom/apps/tests/test_bug_765063.xul
index 8d0ce625b417..6af892f37af0 100644
--- a/dom/apps/tests/test_bug_765063.xul
+++ b/dom/apps/tests/test_bug_765063.xul
@@ -20,6 +20,8 @@
 
 SimpleTest.waitForExplicitFinish();
 
+SpecialPowers.setAllAppsLaunchable(true);
+
 var mmListener = {
   receiveMessage: function(aMessage) {
     ppmm.removeMessageListener("Webapps:Install", mmListener);
diff --git a/dom/apps/tests/test_bug_771294.xul b/dom/apps/tests/test_bug_771294.xul
index c7f97774b656..1a5e69adaf3a 100644
--- a/dom/apps/tests/test_bug_771294.xul
+++ b/dom/apps/tests/test_bug_771294.xul
@@ -19,6 +19,8 @@
 <script>
 SimpleTest.waitForExplicitFinish();
 
+SpecialPowers.setAllAppsLaunchable(true);
+
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PopupNotifications.jsm");
 
diff --git a/dom/apps/tests/test_bug_795164.html b/dom/apps/tests/test_bug_795164.html
index d93332ed53d6..c875c4126712 100644
--- a/dom/apps/tests/test_bug_795164.html
+++ b/dom/apps/tests/test_bug_795164.html
@@ -41,6 +41,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=795164
 
   function runTest() {
     // Set up.
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
diff --git a/dom/apps/tests/test_bug_945152.html b/dom/apps/tests/test_bug_945152.html
index b033fb010127..d32046f4be01 100644
--- a/dom/apps/tests/test_bug_945152.html
+++ b/dom/apps/tests/test_bug_945152.html
@@ -47,6 +47,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=945152
 
   function runTest() {
     // Set up.
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.pushPrefEnv({
       "set": [
         ["dom.mozBrowserFramesEnabled", true],
diff --git a/dom/apps/tests/test_checkInstalled.html b/dom/apps/tests/test_checkInstalled.html
index d2c4a1036416..d8bc58cea3cc 100644
--- a/dom/apps/tests/test_checkInstalled.html
+++ b/dom/apps/tests/test_checkInstalled.html
@@ -53,6 +53,8 @@ function cbError(aError) {
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_iac.html b/dom/apps/tests/test_iac.html
index a6e0e44f2f45..45d02d2e2293 100644
--- a/dom/apps/tests/test_iac.html
+++ b/dom/apps/tests/test_iac.html
@@ -149,6 +149,7 @@ function launchApp(app) {
 
 const tests = [() => {
   info("Test start");
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.autoConfirmAppInstall(() => {
     SpecialPowers.autoConfirmAppUninstall(next);
   });
diff --git a/dom/apps/tests/test_import_export.html b/dom/apps/tests/test_import_export.html
index 7bd2d76cf1b9..87d12bb7c3b2 100644
--- a/dom/apps/tests/test_import_export.html
+++ b/dom/apps/tests/test_import_export.html
@@ -81,6 +81,8 @@ SimpleTest.waitForExplicitFinish();
   * Test exporting and importing hosted and packaged apps.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_install_dev_mode.html b/dom/apps/tests/test_install_dev_mode.html
index aca94969b205..b088c5e7e46b 100644
--- a/dom/apps/tests/test_install_dev_mode.html
+++ b/dom/apps/tests/test_install_dev_mode.html
@@ -60,6 +60,8 @@ SimpleTest.waitForExplicitFinish();
   * Install 2 apps from the same origin and uninstall them.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_install_multiple_apps_origin.html b/dom/apps/tests/test_install_multiple_apps_origin.html
index 0322708e5fd0..800c6ba026b5 100644
--- a/dom/apps/tests/test_install_multiple_apps_origin.html
+++ b/dom/apps/tests/test_install_multiple_apps_origin.html
@@ -53,6 +53,8 @@ SimpleTest.waitForExplicitFinish();
   * Install 2 apps from the same origin and uninstall them.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   var manifestURL1 = gManifestURL + "&app=1";
   var manifestURL2 = gManifestURL + "&app=2";
 
diff --git a/dom/apps/tests/test_install_receipts.html b/dom/apps/tests/test_install_receipts.html
index c83eceee2e8c..3ad4aea14e8d 100644
--- a/dom/apps/tests/test_install_receipts.html
+++ b/dom/apps/tests/test_install_receipts.html
@@ -53,6 +53,8 @@ function cbError(aError) {
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_langpacks.html b/dom/apps/tests/test_langpacks.html
index 4e7ab9f5b9e6..8bdc1680872a 100644
--- a/dom/apps/tests/test_langpacks.html
+++ b/dom/apps/tests/test_langpacks.html
@@ -93,6 +93,7 @@ function installApp(manifestURL) {
 
 function runTest() {
   // Set up.
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.pushPrefEnv({'set': [
     ["dom.mozBrowserFramesEnabled", true],
     ["dom.apps.allow_unsigned_langpacks", true] ]},continueTest);
diff --git a/dom/apps/tests/test_marketplace_pkg_install.html b/dom/apps/tests/test_marketplace_pkg_install.html
index a621597d3436..b6cc095cf95e 100644
--- a/dom/apps/tests/test_marketplace_pkg_install.html
+++ b/dom/apps/tests/test_marketplace_pkg_install.html
@@ -128,6 +128,7 @@ function installApp(installOrigin, manifestURL) {
 
 PackagedTestHelper.setSteps([
   function() {
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.addPermission("webapps-manage", true, document);
     SpecialPowers.addPermission("browser", true, document);
     SpecialPowers.autoConfirmAppInstall(() =>
diff --git a/dom/apps/tests/test_packaged_app_asmjs.html b/dom/apps/tests/test_packaged_app_asmjs.html
index 3e87fc537d7f..8eb0c61ebbf0 100644
--- a/dom/apps/tests/test_packaged_app_asmjs.html
+++ b/dom/apps/tests/test_packaged_app_asmjs.html
@@ -125,6 +125,7 @@ function testNoPrecompile(aPrecompile, aCallback) {
 function runTest() {
   // Set up.
 
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.pushPrefEnv({'set': [["dom.mozBrowserFramesEnabled", true]]},
                             continueTest);
   yield undefined;
diff --git a/dom/apps/tests/test_packaged_app_install.html b/dom/apps/tests/test_packaged_app_install.html
index 3fb6f6c2d914..09ca0dbe169d 100644
--- a/dom/apps/tests/test_packaged_app_install.html
+++ b/dom/apps/tests/test_packaged_app_install.html
@@ -87,6 +87,7 @@ SimpleTest.requestFlakyTimeout("untriaged");
 var steps = [
   function() {
     // Set up
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.addPermission("webapps-manage", true, document);
     info("Set up");
     PackagedTestHelper.next();
diff --git a/dom/apps/tests/test_packaged_app_update.html b/dom/apps/tests/test_packaged_app_update.html
index 45541449169e..ab5118c4d3f8 100644
--- a/dom/apps/tests/test_packaged_app_update.html
+++ b/dom/apps/tests/test_packaged_app_update.html
@@ -142,6 +142,7 @@ function validatePermissions(aList, aDontFail) {
 var steps = [
   function() {
     // Set up
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.addPermission("webapps-manage", true, document);
     info("Set up");
     // Note that without useCurrentProfile the permissions just aren't added.
diff --git a/dom/apps/tests/test_receipt_operations.html b/dom/apps/tests/test_receipt_operations.html
index 0e968cbc804b..960a448ecd67 100644
--- a/dom/apps/tests/test_receipt_operations.html
+++ b/dom/apps/tests/test_receipt_operations.html
@@ -53,6 +53,8 @@ function cbError(aEvent) {
 SimpleTest.waitForExplicitFinish();
 
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_signed_pkg_install.html b/dom/apps/tests/test_signed_pkg_install.html
index 19c763f9f9e0..85b36f62f7a5 100644
--- a/dom/apps/tests/test_signed_pkg_install.html
+++ b/dom/apps/tests/test_signed_pkg_install.html
@@ -95,6 +95,7 @@ var steps = [
       var url = SimpleTest.getTestFileURL("chromeAddCert.js");
       var script = SpecialPowers.loadChromeScript(url);
       script.addMessageListener("addCertCompleted", function() {
+        SpecialPowers.setAllAppsLaunchable(true);
         SpecialPowers.addPermission("webapps-manage", true, document);
         info("Test CA Certificate Selected");
         PackagedTestHelper.next();
diff --git a/dom/apps/tests/test_theme_role.html b/dom/apps/tests/test_theme_role.html
index 4d31ffcada8b..6aab16b2f81d 100644
--- a/dom/apps/tests/test_theme_role.html
+++ b/dom/apps/tests/test_theme_role.html
@@ -56,6 +56,8 @@ SimpleTest.waitForExplicitFinish();
   * Checks that no apps that are not certified can be installed as themes.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_third_party_homescreen.html b/dom/apps/tests/test_third_party_homescreen.html
index 68f643ccec60..e53486ef3ade 100644
--- a/dom/apps/tests/test_third_party_homescreen.html
+++ b/dom/apps/tests/test_third_party_homescreen.html
@@ -146,6 +146,8 @@ SimpleTest.waitForExplicitFinish();
  * Test third-party homescreen (permission |homescreen-webapps-manage|)
  */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/apps/tests/test_uninstall_errors.html b/dom/apps/tests/test_uninstall_errors.html
index 88f4ea608117..1c70d1c4e137 100644
--- a/dom/apps/tests/test_uninstall_errors.html
+++ b/dom/apps/tests/test_uninstall_errors.html
@@ -41,6 +41,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=830258
 
   function runTest() {
     // Set up.
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
diff --git a/dom/apps/tests/test_web_app_install.html b/dom/apps/tests/test_web_app_install.html
index 8071caedd4e1..eb6d45262cd1 100644
--- a/dom/apps/tests/test_web_app_install.html
+++ b/dom/apps/tests/test_web_app_install.html
@@ -103,6 +103,8 @@ SimpleTest.waitForExplicitFinish();
   * Install a web app from a manifest with application/manifest+json MIME type.
   */
 function runTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
+
   var manifestURL = "http://test/tests/dom/apps/tests/file_manifest.json";
 
   SpecialPowers.autoConfirmAppInstall(continueTest);
diff --git a/dom/browser-element/mochitest/browserElement_AllowEmbedAppsInNestedOOIframe.js b/dom/browser-element/mochitest/browserElement_AllowEmbedAppsInNestedOOIframe.js
index 3e2034ac80ba..e36bf487e8cd 100644
--- a/dom/browser-element/mochitest/browserElement_AllowEmbedAppsInNestedOOIframe.js
+++ b/dom/browser-element/mochitest/browserElement_AllowEmbedAppsInNestedOOIframe.js
@@ -10,6 +10,8 @@ SimpleTest.waitForExplicitFinish();
 browserElementTestHelpers.setEnabledPref(true);
 browserElementTestHelpers.addPermission();
 
+SpecialPowers.setAllAppsLaunchable(true);
+
 function runTest() {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', 'true');
diff --git a/dom/browser-element/mochitest/browserElement_AppFramePermission.js b/dom/browser-element/mochitest/browserElement_AppFramePermission.js
index afa637baa8c1..14c974d7eaf5 100644
--- a/dom/browser-element/mochitest/browserElement_AppFramePermission.js
+++ b/dom/browser-element/mochitest/browserElement_AppFramePermission.js
@@ -8,6 +8,8 @@ SimpleTest.waitForExplicitFinish();
 browserElementTestHelpers.setEnabledPref(true);
 browserElementTestHelpers.addPermission();
 
+SpecialPowers.setAllAppsLaunchable(true);
+
 function testAppElement(expectAnApp, callback) {
   var iframe = document.createElement('iframe');
   iframe.setAttribute('mozbrowser', 'true');
diff --git a/dom/browser-element/mochitest/browserElement_DisallowEmbedAppsInOOP.js b/dom/browser-element/mochitest/browserElement_DisallowEmbedAppsInOOP.js
index 944ef5c02b10..0a6233fa426a 100644
--- a/dom/browser-element/mochitest/browserElement_DisallowEmbedAppsInOOP.js
+++ b/dom/browser-element/mochitest/browserElement_DisallowEmbedAppsInOOP.js
@@ -14,6 +14,8 @@ SimpleTest.waitForExplicitFinish();
 browserElementTestHelpers.setEnabledPref(true);
 browserElementTestHelpers.addPermission();
 
+SpecialPowers.setAllAppsLaunchable(true);
+
 function runTest() {
   var canEmbedApp = !browserElementTestHelpers.getOOPByDefaultPref();
   var iframe = document.createElement('iframe');
diff --git a/dom/browser-element/mochitest/browserElement_MultipleAudioChannels.js b/dom/browser-element/mochitest/browserElement_MultipleAudioChannels.js
index 3b7521419a5e..063199df2959 100644
--- a/dom/browser-element/mochitest/browserElement_MultipleAudioChannels.js
+++ b/dom/browser-element/mochitest/browserElement_MultipleAudioChannels.js
@@ -124,6 +124,7 @@ function runNextTest() {
 }
 
 function startTest() {
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/browser-element/mochitest/browserElement_NotifyChannel.js b/dom/browser-element/mochitest/browserElement_NotifyChannel.js
index 44566efad67b..5e65958a1e2e 100644
--- a/dom/browser-element/mochitest/browserElement_NotifyChannel.js
+++ b/dom/browser-element/mochitest/browserElement_NotifyChannel.js
@@ -117,6 +117,7 @@ function runNextTest() {
 }
 
 function runTests() {
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.autoConfirmAppInstall(continueTest);
   yield undefined;
 
diff --git a/dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html b/dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html
index f00a10abb97e..0f6035fac79b 100644
--- a/dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html
+++ b/dom/cache/test/mochitest/test_cache_clear_on_app_uninstall.html
@@ -23,6 +23,7 @@ let gApp;
 
 function setup() {
   return new Promise((resolve, reject) => {
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.pushPrefEnv({'set': [
       ['dom.mozBrowserFramesEnabled', true],
       ['dom.serviceWorkers.exemptFromPerDomainMax', true],
diff --git a/dom/datastore/tests/test_app_install.html b/dom/datastore/tests/test_app_install.html
index bceefce18f30..a628ef01be24 100644
--- a/dom/datastore/tests/test_app_install.html
+++ b/dom/datastore/tests/test_app_install.html
@@ -49,6 +49,7 @@
     ok("getDataStores" in navigator, "getDataStores exists");
     is(typeof navigator.getDataStores, "function", "getDataStores exists and it's a function");
 
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
diff --git a/dom/datastore/tests/test_arrays.html b/dom/datastore/tests/test_arrays.html
index 09f48472636f..e8ca6f827524 100644
--- a/dom/datastore/tests/test_arrays.html
+++ b/dom/datastore/tests/test_arrays.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_basic.html b/dom/datastore/tests/test_basic.html
index 22f209c5d8c8..c8637447a2f2 100644
--- a/dom/datastore/tests/test_basic.html
+++ b/dom/datastore/tests/test_basic.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_basic_worker.html b/dom/datastore/tests/test_basic_worker.html
index 16580fe664aa..94b451cca595 100644
--- a/dom/datastore/tests/test_basic_worker.html
+++ b/dom/datastore/tests/test_basic_worker.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest)
     },
 
diff --git a/dom/datastore/tests/test_bug1008044.html b/dom/datastore/tests/test_bug1008044.html
index 2138bf26f776..07fe18afa977 100644
--- a/dom/datastore/tests/test_bug1008044.html
+++ b/dom/datastore/tests/test_bug1008044.html
@@ -89,6 +89,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_bug1058108.html b/dom/datastore/tests/test_bug1058108.html
index 0c3d1e5b1255..95b864865ac4 100644
--- a/dom/datastore/tests/test_bug1058108.html
+++ b/dom/datastore/tests/test_bug1058108.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_bug924104.html b/dom/datastore/tests/test_bug924104.html
index c70f0fa2c7a2..c82cc591dc27 100644
--- a/dom/datastore/tests/test_bug924104.html
+++ b/dom/datastore/tests/test_bug924104.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_bug957086.html b/dom/datastore/tests/test_bug957086.html
index b708d4c1c290..dc3244245bf0 100644
--- a/dom/datastore/tests/test_bug957086.html
+++ b/dom/datastore/tests/test_bug957086.html
@@ -93,6 +93,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_bug976311.html b/dom/datastore/tests/test_bug976311.html
index 95c7d3dccc60..499d8b66635e 100644
--- a/dom/datastore/tests/test_bug976311.html
+++ b/dom/datastore/tests/test_bug976311.html
@@ -93,6 +93,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_bug986056.html b/dom/datastore/tests/test_bug986056.html
index 877685ad504b..18e8a67b7d1c 100644
--- a/dom/datastore/tests/test_bug986056.html
+++ b/dom/datastore/tests/test_bug986056.html
@@ -86,6 +86,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_certifiedApp.html b/dom/datastore/tests/test_certifiedApp.html
index ee6128ff2dd7..707c8ce5215a 100644
--- a/dom/datastore/tests/test_certifiedApp.html
+++ b/dom/datastore/tests/test_certifiedApp.html
@@ -95,6 +95,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_changes.html b/dom/datastore/tests/test_changes.html
index 83c9989fbd34..a3806b9f86fb 100644
--- a/dom/datastore/tests/test_changes.html
+++ b/dom/datastore/tests/test_changes.html
@@ -132,6 +132,7 @@
    	    SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
    	  }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_duplicate.html b/dom/datastore/tests/test_duplicate.html
index d3143dc9c495..40ba78d26be7 100644
--- a/dom/datastore/tests/test_duplicate.html
+++ b/dom/datastore/tests/test_duplicate.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_keys.html b/dom/datastore/tests/test_keys.html
index 4410bde03f07..23311d8c41ec 100644
--- a/dom/datastore/tests/test_keys.html
+++ b/dom/datastore/tests/test_keys.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_notify_system_message.html b/dom/datastore/tests/test_notify_system_message.html
index ec670c992f7e..1312c75512cd 100644
--- a/dom/datastore/tests/test_notify_system_message.html
+++ b/dom/datastore/tests/test_notify_system_message.html
@@ -87,6 +87,7 @@
     },
 
     function() {
+      SpecialPowers.setAllAppsLaunchable(true);
       // No confirmation needed when an app is installed.
       SpecialPowers.autoConfirmAppInstall(() => {
         SpecialPowers.autoConfirmAppUninstall(runTest);
diff --git a/dom/datastore/tests/test_oop.html b/dom/datastore/tests/test_oop.html
index a785a8cd0cab..21ab129894ee 100644
--- a/dom/datastore/tests/test_oop.html
+++ b/dom/datastore/tests/test_oop.html
@@ -89,6 +89,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_oop_events.html b/dom/datastore/tests/test_oop_events.html
index b5274b572ab5..0ffae98f59f3 100644
--- a/dom/datastore/tests/test_oop_events.html
+++ b/dom/datastore/tests/test_oop_events.html
@@ -117,6 +117,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_readonly.html b/dom/datastore/tests/test_readonly.html
index d5663874eb16..aaa417fbf325 100644
--- a/dom/datastore/tests/test_readonly.html
+++ b/dom/datastore/tests/test_readonly.html
@@ -36,6 +36,7 @@
       SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
     }
 
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.autoConfirmAppInstall(continueTest);
     yield undefined;
 
diff --git a/dom/datastore/tests/test_transactions.html b/dom/datastore/tests/test_transactions.html
index 31b0d00b3822..31ee2b3cdc5f 100644
--- a/dom/datastore/tests/test_transactions.html
+++ b/dom/datastore/tests/test_transactions.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/datastore/tests/test_worker_close.html b/dom/datastore/tests/test_worker_close.html
index ed103713e15f..80acedae7db5 100644
--- a/dom/datastore/tests/test_worker_close.html
+++ b/dom/datastore/tests/test_worker_close.html
@@ -88,6 +88,7 @@
         SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
       }
 
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTest);
     },
 
diff --git a/dom/downloads/tests/shim_app_as_test.js b/dom/downloads/tests/shim_app_as_test.js
index 0b83746bf15d..18846fa45a86 100644
--- a/dom/downloads/tests/shim_app_as_test.js
+++ b/dom/downloads/tests/shim_app_as_test.js
@@ -166,6 +166,7 @@
 
     function() {
       info("enabling use of mozbrowser");
+      //SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
       runTests();
     },
diff --git a/dom/indexedDB/test/webapp_clearBrowserData.js b/dom/indexedDB/test/webapp_clearBrowserData.js
index ee5b9e1da1d4..202d013f3710 100644
--- a/dom/indexedDB/test/webapp_clearBrowserData.js
+++ b/dom/indexedDB/test/webapp_clearBrowserData.js
@@ -115,6 +115,8 @@ function start()
   SpecialPowers.addPermission("embed-apps", true, document);
   SpecialPowers.addPermission("indexedDB", true, { manifestURL: manifestURL });
 
+  SpecialPowers.setAllAppsLaunchable(true);
+
   window.addEventListener("unload", function cleanup(event) {
     if (event.target == document) {
       window.removeEventListener("unload", cleanup, false);
diff --git a/dom/ipc/tests/test_permission_helper.js b/dom/ipc/tests/test_permission_helper.js
index 00269ee4d9e9..6d2cc9f5d632 100644
--- a/dom/ipc/tests/test_permission_helper.js
+++ b/dom/ipc/tests/test_permission_helper.js
@@ -31,6 +31,8 @@ var gScript = SpecialPowers.loadChromeScript(SimpleTest.getTestFileURL('test_per
 
 // Delay reporting a result until after finish() got called
 SimpleTest.waitForExplicitFinish();
+// Allow tests to disable the per platform app validity checks
+SpecialPowers.setAllAppsLaunchable(true);
 
 // Run tests in order
 function runTests() {
diff --git a/dom/messages/test/test_sysmsg_registration.html b/dom/messages/test/test_sysmsg_registration.html
index 707c14c0ca22..888d5377b33a 100644
--- a/dom/messages/test/test_sysmsg_registration.html
+++ b/dom/messages/test/test_sysmsg_registration.html
@@ -140,6 +140,7 @@ function testBroadcastMessage(aMessage, aExpectedManifestURL, aMsg) {
  */
 let steps = [() => {
   Services.obs.notifyObservers(null, "webapps-registry-ready", null);
+  SpecialPowers.setAllAppsLaunchable(true);
   SpecialPowers.autoConfirmAppInstall(next);
 }, () => {
   SpecialPowers.autoConfirmAppUninstall(next);
diff --git a/dom/requestsync/tests/test_basic_app.html b/dom/requestsync/tests/test_basic_app.html
index 06350cc19db5..d804fe2b9512 100644
--- a/dom/requestsync/tests/test_basic_app.html
+++ b/dom/requestsync/tests/test_basic_app.html
@@ -86,6 +86,7 @@
 
     function() {
       SpecialPowers.importInMainProcess("resource://gre/modules/RequestSyncService.jsm");
+      SpecialPowers.setAllAppsLaunchable(true);
       SpecialPowers.pushPrefEnv({"set":[["dom.mozBrowserFramesEnabled", true]]}, runTests);
     },
 
diff --git a/dom/security/test/csp/test_bug949549.html b/dom/security/test/csp/test_bug949549.html
index 3d6528abbd70..30ee08af1ec8 100644
--- a/dom/security/test/csp/test_bug949549.html
+++ b/dom/security/test/csp/test_bug949549.html
@@ -26,6 +26,7 @@
   function setupTest() {
     // We have to install an app in order for the app URL to be valid
     // (otherwise we get a "DummyChannel" that throws NS_NOT_IMPLEMENTED)
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.addPermission("webapps-manage", true, document);
     SpecialPowers.autoConfirmAppInstall(function () {
       let req = navigator.mozApps.install(gManifestURL);
diff --git a/dom/tests/mochitest/fetch/test_fetch_app_protocol.html b/dom/tests/mochitest/fetch/test_fetch_app_protocol.html
index de9a98c27127..5c3f64101dda 100644
--- a/dom/tests/mochitest/fetch/test_fetch_app_protocol.html
+++ b/dom/tests/mochitest/fetch/test_fetch_app_protocol.html
@@ -24,6 +24,7 @@ let gApp;
 function setup() {
   info('Setting up');
   return new Promise((resolve, reject) => {
+    SpecialPowers.setAllAppsLaunchable(true);
     SpecialPowers.pushPrefEnv({'set': [
       ['dom.mozBrowserFramesEnabled', true]
     ]}, () => {
diff --git a/dom/tests/mochitest/localstorage/test_clear_browser_data.html b/dom/tests/mochitest/localstorage/test_clear_browser_data.html
index d15829f26524..d22951565ec4 100644
--- a/dom/tests/mochitest/localstorage/test_clear_browser_data.html
+++ b/dom/tests/mochitest/localstorage/test_clear_browser_data.html
@@ -76,6 +76,9 @@ SimpleTest.registerCleanupFunction(() => {
                                   Ci.nsIPermissionManager.ALLOW_ACTION);
 });
 
+// We want to simulate that all apps are launchable, for testing purpose.
+SpecialPowers.setAllAppsLaunchable(true);
+
 // URL of the manifest of the app we want to install.
 const gManifestURL = "http://www.example.com/chrome/dom/apps/tests/apps/basic.webapp";
 // ID of the installed app.
diff --git a/dom/tests/mochitest/notification/NotificationTest.js b/dom/tests/mochitest/notification/NotificationTest.js
index 22321d786761..046460b989bf 100644
--- a/dom/tests/mochitest/notification/NotificationTest.js
+++ b/dom/tests/mochitest/notification/NotificationTest.js
@@ -9,6 +9,7 @@ var NotificationTest = (function () {
     SimpleTest.waitForExplicitFinish();
     // turn on testing pref (used by notification.cpp, and mock the alerts
     SpecialPowers.setBoolPref("notification.prompt.testing", true);
+    SpecialPowers.setAllAppsLaunchable(true);
   }
 
   function teardown_testing_env() {
diff --git a/netwerk/test/mochitests/test_web_packaged_app.html b/netwerk/test/mochitests/test_web_packaged_app.html
index 184aa893fc6d..0d127afb59b8 100644
--- a/netwerk/test/mochitests/test_web_packaged_app.html
+++ b/netwerk/test/mochitests/test_web_packaged_app.html
@@ -91,6 +91,7 @@ function runTest() {
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 
   // Install the app
+  SpecialPowers.setAllAppsLaunchable(true);
   var manifestURL = "http://test/tests/dom/apps/tests/file_app.sjs?apptype=hosted&getmanifest=true";
 
   SpecialPowers.autoConfirmAppInstall(continueTest);
diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index c5886618583e..88624f257202 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -1070,6 +1070,7 @@ SimpleTest.finish = function() {
         }
 
         if (!parentRunner || parentRunner.showTestReport) {
+            SpecialPowers.flushAllAppsLaunchable();
             SpecialPowers.flushPermissions(function () {
               SpecialPowers.flushPrefEnv(function() {
                 SimpleTest.showReport();
diff --git a/testing/mochitest/tests/SimpleTest/TestRunner.js b/testing/mochitest/tests/SimpleTest/TestRunner.js
index dd88bd1c50f3..22aaa139de66 100644
--- a/testing/mochitest/tests/SimpleTest/TestRunner.js
+++ b/testing/mochitest/tests/SimpleTest/TestRunner.js
@@ -596,6 +596,7 @@ TestRunner.testFinished = function(tests) {
 
     SpecialPowers.executeAfterFlushingMessageQueue(function() {
         cleanUpCrashDumpFiles();
+        SpecialPowers.flushAllAppsLaunchable();
         SpecialPowers.flushPermissions(function () { SpecialPowers.flushPrefEnv(runNextTest); });
     });
 };
diff --git a/testing/specialpowers/content/SpecialPowersObserverAPI.js b/testing/specialpowers/content/SpecialPowersObserverAPI.js
index eb679184e60a..a0e0b7945a9e 100644
--- a/testing/specialpowers/content/SpecialPowersObserverAPI.js
+++ b/testing/specialpowers/content/SpecialPowersObserverAPI.js
@@ -355,6 +355,10 @@ SpecialPowersObserverAPI.prototype = {
         let Webapps = {};
         Components.utils.import("resource://gre/modules/Webapps.jsm", Webapps);
         switch (aMessage.json.op) {
+          case "set-launchable":
+            let val = Webapps.DOMApplicationRegistry.allAppsLaunchable;
+            Webapps.DOMApplicationRegistry.allAppsLaunchable = aMessage.json.launchable;
+            return val;
           case "allow-unsigned-addons":
             {
               let utils = {};
diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index 6da6640ac853..5f0ec8b0a25a 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -1130,6 +1130,15 @@ SpecialPowersAPI.prototype = {
     this.pushPrefEnv({set: [['dom.mozApps.auto_confirm_uninstall', true]]}, cb);
   },
 
+  // Allow tests to disable the per platform app validity checks so we can
+  // test higher level WebApp functionality without full platform support.
+  setAllAppsLaunchable: function(launchable) {
+    this._sendSyncMessage("SPWebAppService", {
+      op: "set-launchable",
+      launchable: launchable
+    });
+  },
+
   // Allow tests to install addons without signing the package, for convenience.
   allowUnsignedAddons: function() {
     this._sendSyncMessage("SPWebAppService", {
@@ -1145,6 +1154,14 @@ SpecialPowersAPI.prototype = {
     });
   },
 
+  // Restore the launchable property to its default value.
+  flushAllAppsLaunchable: function() {
+    this._sendSyncMessage("SPWebAppService", {
+      op: "set-launchable",
+      launchable: false
+    });
+  },
+
   // Force-registering an app in the registry
   injectApp: function(aAppId, aApp) {
     this._sendSyncMessage("SPWebAppService", {