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

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

1 files changed, 0 insertions, 94 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js b/toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js
deleted file mode 100644
index c83638d54..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_getresource.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// install.rdf size, icon.png size, subfile.txt size
-const ADDON_SIZE = 672 + 15 + 26;
-
-// This verifies the functionality of getResourceURI
-// There are two cases - with a filename it returns an nsIFileURL to the filename
-// and with no parameters, it returns an nsIFileURL to the root of the addon
-
-function run_test() {
-  do_test_pending();
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1");
-
-  startupManager();
-
-  AddonManager.getInstallForFile(do_get_addon("test_getresource"), function(aInstall) {
-    do_check_true(aInstall.addon.hasResource("install.rdf"));
-    do_check_eq(aInstall.addon.getResourceURI().spec, aInstall.sourceURI.spec);
-
-    do_check_true(aInstall.addon.hasResource("icon.png"));
-    do_check_eq(aInstall.addon.getResourceURI("icon.png").spec,
-                "jar:" + aInstall.sourceURI.spec + "!/icon.png");
-
-    do_check_false(aInstall.addon.hasResource("missing.txt"));
-
-    do_check_true(aInstall.addon.hasResource("subdir/subfile.txt"));
-    do_check_eq(aInstall.addon.getResourceURI("subdir/subfile.txt").spec,
-                "jar:" + aInstall.sourceURI.spec + "!/subdir/subfile.txt");
-
-    do_check_false(aInstall.addon.hasResource("subdir/missing.txt"));
-
-    do_check_eq(aInstall.addon.size, ADDON_SIZE);
-
-    completeAllInstalls([aInstall], function() {
-      restartManager();
-      AddonManager.getAddonByID("addon1@tests.mozilla.org", function(a1) {
-        do_check_neq(a1, null);
-
-        let addonDir = gProfD.clone();
-        addonDir.append("extensions");
-        let rootUri = do_get_addon_root_uri(addonDir, "addon1@tests.mozilla.org");
-
-        let uri = a1.getResourceURI("/");
-        do_check_eq(uri.spec, rootUri);
-
-        let file = rootUri + "install.rdf";
-        do_check_true(a1.hasResource("install.rdf"));
-        uri = a1.getResourceURI("install.rdf")
-        do_check_eq(uri.spec, file);
-
-        file = rootUri + "icon.png";
-        do_check_true(a1.hasResource("icon.png"));
-        uri = a1.getResourceURI("icon.png")
-        do_check_eq(uri.spec, file);
-
-        do_check_false(a1.hasResource("missing.txt"));
-
-        file = rootUri + "subdir/subfile.txt";
-        do_check_true(a1.hasResource("subdir/subfile.txt"));
-        uri = a1.getResourceURI("subdir/subfile.txt")
-        do_check_eq(uri.spec, file);
-
-        do_check_false(a1.hasResource("subdir/missing.txt"));
-
-        do_check_eq(a1.size, ADDON_SIZE);
-
-        a1.uninstall();
-
-        try {
-          // hasResource should never throw an exception.
-          do_check_false(a1.hasResource("icon.png"));
-        } catch (e) {
-          do_check_true(false);
-        }
-
-        AddonManager.getInstallForFile(do_get_addon("test_getresource"),
-            callback_soon(function(aInstall_2) {
-          do_check_false(a1.hasResource("icon.png"));
-          do_check_true(aInstall_2.addon.hasResource("icon.png"));
-
-          restartManager();
-
-          AddonManager.getAddonByID("addon1@tests.mozilla.org", function(newa1) {
-            do_check_eq(newa1, null);
-
-            do_execute_soon(do_test_finished);
-          });
-        }));
-      });
-    });
-  });
-}