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

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

1 files changed, 0 insertions, 40 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js b/toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js
deleted file mode 100644
index 0d96e7cbe..000000000
--- a/toolkit/mozapps/webextensions/test/xpinstall/browser_bug638292.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// ----------------------------------------------------------------------------
-// Test whether an InstallTrigger.enabled is working
-add_task(function * ()
-{
-  let testtab = yield BrowserTestUtils.openNewForegroundTab(gBrowser, TESTROOT + "bug638292.html");
-
-  function* verify(link, button)
-  {
-    info("Clicking " + link);
-
-    let waitForNewTabPromise = BrowserTestUtils.waitForNewTab(gBrowser);
-
-    yield BrowserTestUtils.synthesizeMouseAtCenter("#" + link, { button: button },
-                                                   gBrowser.selectedBrowser);
-
-    let newtab = yield waitForNewTabPromise;
-
-    yield BrowserTestUtils.browserLoaded(newtab.linkedBrowser);
-
-    let result = yield ContentTask.spawn(newtab.linkedBrowser, { }, function* () {
-      return (content.document.getElementById("enabled").textContent == "true");
-    });
-
-    ok(result, "installTrigger for " + link + " should have been enabled");
-
-    // Focus the old tab (link3 is opened in the background)
-    if (link != "link3") {
-      yield BrowserTestUtils.switchTab(gBrowser, testtab);
-    }
-    gBrowser.removeTab(newtab);
-  }
-
-  yield* verify("link1", 0);
-  yield* verify("link2", 0);
-  yield* verify("link3", 1);
-
-  gBrowser.removeCurrentTab();
-});
-
-