Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 32 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js
deleted file mode 100644
index cc1b8a8b2..000000000
--- a/toolkit/mozapps/webextensions/test/xpinstall/browser_enabled2.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// ----------------------------------------------------------------------------
-// Test whether an InstallTrigger.enabled is working
-function test() {
-  waitForExplicitFinish();
-
-  Services.prefs.setBoolPref("xpinstall.enabled", false);
-
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  ContentTask.spawn(gBrowser.selectedBrowser, TESTROOT + "enabled.html", function (url) {
-    return new Promise(resolve => {
-      function page_loaded() {
-        content.removeEventListener("PageLoaded", page_loaded, false);
-        resolve(content.document.getElementById("enabled").textContent);
-      }
-
-      function load_listener() {
-        removeEventListener("load", load_listener, true);
-        content.addEventListener("PageLoaded", page_loaded, false);
-      }
-
-      addEventListener("load", load_listener, true);
-
-      content.location.href = url;
-    });
-  }).then(text => {
-    is(text, "false", "installTrigger should have not been enabled");
-    Services.prefs.clearUserPref("xpinstall.enabled");
-    gBrowser.removeCurrentTab();
-    finish();
-  });
-}