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

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

1 files changed, 0 insertions, 21 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js b/toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js
deleted file mode 100644
index a6c635eac..000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_childprocess.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// This verifies that the AddonManager refuses to load in child processes.
-
-function run_test() {
-  // Already loaded the module by head_addons.js. Need to unload this again, so
-  // that overriding the app-info and re-importing the module works.
-  Components.utils.unload("resource://gre/modules/AddonManager.jsm");
-  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-  gAppInfo.processType = AM_Ci.nsIXULRuntime.PROCESS_TYPE_CONTENT;
-  try {
-    Components.utils.import("resource://gre/modules/AddonManager.jsm");
-    do_throw("AddonManager should have refused to load");
-  }
-  catch (ex) {
-    do_print(ex.message);
-    do_check_true(!!ex.message);
-  }
-}