Remove MOZ_B2G leftovers and some dead B2G-only components.

1 files changed, 1 insertions, 8 deletions

diff --git a/toolkit/identity/FirefoxAccounts.jsm b/toolkit/identity/FirefoxAccounts.jsm
index 54efaf3b4..1d2ed0439 100644
--- a/toolkit/identity/FirefoxAccounts.jsm
+++ b/toolkit/identity/FirefoxAccounts.jsm
@@ -35,18 +35,11 @@ var log = Log.repository.getLogger("Identity.FxAccounts");
 log.level = LOG_LEVEL;
 log.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
 
-#ifdef MOZ_B2G
-XPCOMUtils.defineLazyModuleGetter(this, "FxAccountsManager",
-                                  "resource://gre/modules/FxAccountsManager.jsm",
-                                  "FxAccountsManager");
-Cu.import("resource://gre/modules/FxAccountsCommon.js");
-#else
-log.warn("The FxAccountsManager is only functional in B2G at this time.");
+log.warn("The FxAccountsManager has been removed.");
 var FxAccountsManager = null;
 var ONVERIFIED_NOTIFICATION = null;
 var ONLOGIN_NOTIFICATION = null;
 var ONLOGOUT_NOTIFICATION = null;
-#endif
 
 function FxAccountsService() {
   Services.obs.addObserver(this, "quit-application-granted", false);