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

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

1 files changed, 0 insertions, 24 deletions

diff --git a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js b/toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js
deleted file mode 100644
index 56118c4e1..000000000
--- a/toolkit/mozapps/extensions/test/xpinstall/browser_enabled.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// ----------------------------------------------------------------------------
-// Test whether an InstallTrigger.enabled is working
-function test() {
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  function loadListener() {
-    gBrowser.selectedBrowser.removeEventListener("load", loadListener, true);
-    gBrowser.contentWindow.addEventListener("PageLoaded", page_loaded, false);
-  }
-
-  gBrowser.selectedBrowser.addEventListener("load", loadListener, true);
-  gBrowser.loadURI(TESTROOT + "enabled.html");
-}
-
-function page_loaded() {
-  gBrowser.contentWindow.removeEventListener("PageLoaded", page_loaded, false);
-
-  var doc = gBrowser.contentDocument;
-  is(doc.getElementById("enabled").textContent, "true", "installTrigger should have been enabled");
-  gBrowser.removeCurrentTab();
-  finish();
-}