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

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

1 files changed, 0 insertions, 38 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js
deleted file mode 100644
index b4b1110b0..000000000
--- a/toolkit/mozapps/webextensions/test/xpinstall/browser_badargs.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// ----------------------------------------------------------------------------
-// Test whether passing a simple string to InstallTrigger.install throws an
-// exception
-function test() {
-  waitForExplicitFinish();
-
-  var triggers = encodeURIComponent(JSON.stringify(TESTROOT + "amosigned.xpi"));
-  gBrowser.selectedTab = gBrowser.addTab();
-
-  ContentTask.spawn(gBrowser.selectedBrowser, null, function() {
-    return new Promise(resolve => {
-      addEventListener("load", () => {
-        content.addEventListener("InstallTriggered", () => {
-          resolve(content.document.getElementById("return").textContent);
-        });
-      }, true);
-    });
-  }).then(page_loaded);
-
-  // In non-e10s the exception in the content page would trigger a test failure
-  if (!gMultiProcessBrowser)
-    expectUncaughtException();
-
-  gBrowser.loadURI(TESTROOT + "installtrigger.html?" + triggers);
-}
-
-function page_loaded(result) {
-  is(result, "exception", "installTrigger should have failed");
-
-  // In non-e10s the exception from the page is thrown after the event so we
-  // have to spin the event loop to make sure it arrives so expectUncaughtException
-  // sees it.
-  executeSoon(() => {
-    gBrowser.removeCurrentTab();
-    finish();
-  });
-}
-// ----------------------------------------------------------------------------