diff options
Diffstat (limited to 'services/sync/modules/status.js')
| -rw-r--r-- | services/sync/modules/status.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/sync/modules/status.js b/services/sync/modules/status.js index 100bc7965..a5b8305b4 100644 --- a/services/sync/modules/status.js +++ b/services/sync/modules/status.js @@ -12,7 +12,6 @@ var Cu = Components.utils; Cu.import("resource://services-sync/constants.js"); Cu.import("resource://gre/modules/Log.jsm"); Cu.import("resource://services-sync/identity.js"); -Cu.import("resource://services-sync/browserid_identity.js"); Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://services-common/async.js"); @@ -28,9 +27,12 @@ this.Status = { let service = Components.classes["@mozilla.org/weave/service;1"] .getService(Components.interfaces.nsISupports) .wrappedJSObject; - let idClass = service.fxAccountsEnabled ? BrowserIDManager : IdentityManager; + let idClass = IdentityManager; this.__authManager = new idClass(); - this.__authManager.initialize(); + // .initialize returns a promise, so we need to spin until it resolves. + let cb = Async.makeSpinningCallback(); + this.__authManager.initialize().then(cb, cb); + cb.wait(); return this.__authManager; }, |