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

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

1 files changed, 0 insertions, 90 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_error.js b/toolkit/mozapps/webextensions/test/xpcshell/test_error.js
deleted file mode 100644
index 11a465b55..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_error.js
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests that various error conditions are handled correctly
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-const profileDir = gProfD.clone();
-profileDir.append("extensions");
-
-function run_test() {
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-  startupManager();
-
-  do_test_pending();
-  run_test_1();
-}
-
-// Checks that a local file validates ok
-function run_test_1() {
-  AddonManager.getInstallForFile(do_get_file("data/unsigned.xpi"), function(install) {
-    do_check_neq(install, null);
-    do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
-    do_check_eq(install.error, 0);
-
-    install.cancel();
-
-    run_test_2();
-  });
-}
-
-// Checks that a corrupt file shows an error
-function run_test_2() {
-  AddonManager.getInstallForFile(do_get_file("data/corrupt.xpi"), function(install) {
-    do_check_neq(install, null);
-    do_check_eq(install.state, AddonManager.STATE_DOWNLOAD_FAILED);
-    do_check_eq(install.error, AddonManager.ERROR_CORRUPT_FILE);
-
-    run_test_3();
-  });
-}
-
-// Checks that an empty file shows an error
-function run_test_3() {
-  AddonManager.getInstallForFile(do_get_file("data/empty.xpi"), function(install) {
-    do_check_neq(install, null);
-    do_check_eq(install.state, AddonManager.STATE_DOWNLOAD_FAILED);
-    do_check_eq(install.error, AddonManager.ERROR_CORRUPT_FILE);
-
-    run_test_4();
-  });
-}
-
-// Checks that a file that doesn't match its hash shows an error
-function run_test_4() {
-  let url = Services.io.newFileURI(do_get_file("data/unsigned.xpi")).spec;
-  AddonManager.getInstallForURL(url, function(install) {
-    do_check_neq(install, null);
-    do_check_eq(install.state, AddonManager.STATE_DOWNLOAD_FAILED);
-    do_check_eq(install.error, AddonManager.ERROR_INCORRECT_HASH);
-
-    run_test_5();
-  }, "application/x-xpinstall", "sha1:foo");
-}
-
-// Checks that a file that doesn't exist shows an error
-function run_test_5() {
-  let file = do_get_file("data");
-  file.append("missing.xpi");
-  AddonManager.getInstallForFile(file, function(install) {
-    do_check_neq(install, null);
-    do_check_eq(install.state, AddonManager.STATE_DOWNLOAD_FAILED);
-    do_check_eq(install.error, AddonManager.ERROR_NETWORK_FAILURE);
-
-    run_test_6();
-  });
-}
-
-// Checks that an add-on with an illegal ID shows an error
-function run_test_6() {
-  AddonManager.getInstallForFile(do_get_addon("test_bug567173"), function(install) {
-    do_check_neq(install, null);
-    do_check_eq(install.state, AddonManager.STATE_DOWNLOAD_FAILED);
-    do_check_eq(install.error, AddonManager.ERROR_CORRUPT_FILE);
-
-    do_execute_soon(do_test_finished);
-  });
-}