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

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

1 files changed, 0 insertions, 27 deletions

diff --git a/toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js b/toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js
deleted file mode 100644
index db53dc747..000000000
--- a/toolkit/mozapps/webextensions/test/xpcshell/test_bug595081.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Tests that the AddonManager objects cannot be tampered with
-
-function run_test() {
-  // Setup for test
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-  startupManager();
-
-  // Verify that properties cannot be changed
-  let old = AddonManager.STATE_AVAILABLE;
-  AddonManager.STATE_AVAILABLE = 28;
-  do_check_eq(AddonManager.STATE_AVAILABLE, old);
-
-  // Verify that functions cannot be replaced
-  AddonManager.isInstallEnabled = function() {
-    do_throw("Should not be able to replace a function");
-  }
-  AddonManager.isInstallEnabled("application/x-xpinstall");
-
-  // Verify that properties cannot be added
-  AddonManager.foo = "bar";
-  do_check_false("foo" in AddonManager);
-}