From 5f275c1a91b266c496c6e534d4771848d57a6393 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Fri, 25 Oct 2013 15:25:51 +0100 Subject: [PATCH] Backed out changeset a74f511a4d99 (bug 929297) for xpcshell failures on a CLOSED TREE --- toolkit/mozapps/extensions/AddonManager.jsm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm index d4e9ef59faec..91f547425e38 100644 --- a/toolkit/mozapps/extensions/AddonManager.jsm +++ b/toolkit/mozapps/extensions/AddonManager.jsm @@ -9,14 +9,6 @@ const Ci = Components.interfaces; const Cr = Components.results; const Cu = Components.utils; -Cu.import("resource://gre/modules/Services.jsm"); - -if (Services.appinfo.processType != Ci.nsIXULRuntime.PROCESS_TYPE_DEFAULT) { - // Refuse to run in child processes. - throw new Error("You cannot use the AddonManager in child processes!"); -} - - const PREF_BLOCKLIST_PINGCOUNTVERSION = "extensions.blocklist.pingCountVersion"; const PREF_EM_UPDATE_ENABLED = "extensions.update.enabled"; const PREF_EM_LAST_APP_VERSION = "extensions.lastAppVersion"; @@ -51,6 +43,7 @@ const TOOLKIT_ID = "toolkit@mozilla.org"; const VALID_TYPES_REGEXP = /^[\w\-]+$/; +Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/AsyncShutdown.jsm");