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

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

1 files changed, 0 insertions, 127 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js b/toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js
deleted file mode 100644
index f3448abd2..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_cacheflush.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This verifies that flushing the zipreader cache happens when appropriate
-
-var gExpectedFile = null;
-var gCacheFlushCount = 0;
-
-var CacheFlushObserver = {
-  observe: function(aSubject, aTopic, aData) {
-    if (aTopic != "flush-cache-entry")
-      return;
-    // Ignore flushes triggered by the fake cert DB
-    if (aData == "cert-override")
-      return;
-
-    do_check_true(gExpectedFile != null);
-    do_check_true(aSubject instanceof AM_Ci.nsIFile);
-    do_check_eq(aSubject.path, gExpectedFile.path);
-    gCacheFlushCount++;
-  }
-};
-
-function run_test() {
-  do_test_pending();
-  Services.obs.addObserver(CacheFlushObserver, "flush-cache-entry", false);
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "2");
-
-  startupManager();
-
-  run_test_1();
-}
-
-// Tests that the cache is flushed when cancelling a pending install
-function run_test_1() {
-  AddonManager.getInstallForFile(do_get_addon("test_cacheflush1"), function(aInstall) {
-    completeAllInstalls([aInstall], function() {
-      // We should flush the staged XPI when cancelling the install
-      gExpectedFile = gProfD.clone();
-      gExpectedFile.append("extensions");
-      gExpectedFile.append("staged");
-      gExpectedFile.append("addon1@tests.mozilla.org.xpi");
-      aInstall.cancel();
-
-      do_check_eq(gCacheFlushCount, 1);
-      gExpectedFile = null;
-      gCacheFlushCount = 0;
-
-      run_test_2();
-    });
-  });
-}
-
-// Tests that the cache is flushed when uninstalling an add-on
-function run_test_2() {
-  installAllFiles([do_get_addon("test_cacheflush1")], function() {
-    // Installing will flush the staged XPI during startup
-    gExpectedFile = gProfD.clone();
-    gExpectedFile.append("extensions");
-    gExpectedFile.append("staged");
-    gExpectedFile.append("addon1@tests.mozilla.org.xpi");
-    restartManager();
-    do_check_eq(gCacheFlushCount, 1);
-    gExpectedFile = null;
-    gCacheFlushCount = 0;
-
-    AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
-      // We should flush the installed XPI when uninstalling
-      do_check_true(a1 != null);
-      a1.uninstall();
-      do_check_eq(gCacheFlushCount, 0);
-
-      gExpectedFile = gProfD.clone();
-      gExpectedFile.append("extensions");
-      gExpectedFile.append("addon1@tests.mozilla.org.xpi");
-      restartManager();
-      do_check_eq(gCacheFlushCount, 1);
-      gExpectedFile = null;
-      gCacheFlushCount = 0;
-
-      do_execute_soon(run_test_3);
-    });
-  });
-}
-
-// Tests that the cache is flushed when installing a restartless add-on
-function run_test_3() {
-  AddonManager.getInstallForFile(do_get_addon("test_cacheflush2"), function(aInstall) {
-    aInstall.addListener({
-      onInstallStarted: function() {
-        // We should flush the staged XPI when completing the install
-        gExpectedFile = gProfD.clone();
-        gExpectedFile.append("extensions");
-        gExpectedFile.append("staged");
-        gExpectedFile.append("addon2@tests.mozilla.org.xpi");
-      },
-
-      onInstallEnded: function() {
-        do_check_eq(gCacheFlushCount, 1);
-        gExpectedFile = null;
-        gCacheFlushCount = 0;
-
-        do_execute_soon(run_test_4);
-      }
-    });
-
-    aInstall.install();
-  });
-}
-
-// Tests that the cache is flushed when uninstalling a restartless add-on
-function run_test_4() {
-  AddonManager.getAddonByID("addon2@tests.mozilla.org", function(a2) {
-    // We should flush the installed XPI when uninstalling
-    gExpectedFile = gProfD.clone();
-    gExpectedFile.append("extensions");
-    gExpectedFile.append("addon2@tests.mozilla.org.xpi");
-
-    a2.uninstall();
-    do_check_eq(gCacheFlushCount, 2);
-    gExpectedFile = null;
-    gCacheFlushCount = 0;
-
-    do_execute_soon(do_test_finished);
-  });
-}