diff options
Diffstat (limited to 'toolkit/identity')
-rw-r--r-- | toolkit/identity/FirefoxAccounts.jsm | 9 | ||||
-rw-r--r-- | toolkit/identity/tests/unit/xpcshell.ini | 2 |
2 files changed, 2 insertions, 9 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); diff --git a/toolkit/identity/tests/unit/xpcshell.ini b/toolkit/identity/tests/unit/xpcshell.ini index 8ef9b79bc..38b37402c 100644 --- a/toolkit/identity/tests/unit/xpcshell.ini +++ b/toolkit/identity/tests/unit/xpcshell.ini @@ -1,7 +1,7 @@ [DEFAULT] head = head_identity.js tail = tail_identity.js -skip-if = (appname != "b2g" || toolkit == 'gonk') +skip-if = true support-files = data/idp_1/.well-known/browserid data/idp_invalid_1/.well-known/browserid |