From f3484aa1b2abd3bb20debbfef8abf4155b3576dd Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Mon, 10 Jul 2017 16:51:15 -0700 Subject: [PATCH] Backed out changeset dec7cb09336e (bug 1369539) for test_uistate.js failures a=backout MozReview-Commit-ID: 4SBjyEI1v6q --- browser/base/content/browser.js | 4 +--- browser/base/content/test/performance/browser_startup.js | 2 -- services/sync/modules/UIState.jsm | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 031c1efc684d..1c0fa4ad067a 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -1638,9 +1638,7 @@ var gBrowserInit = { } // initialize the sync UI - requestIdleCallback(() => { - gSync.init(); - }, {timeout: 1000 * 5}); + gSync.init(); if (AppConstants.MOZ_DATA_REPORTING) gDataNotificationInfoBar.init(); diff --git a/browser/base/content/test/performance/browser_startup.js b/browser/base/content/test/performance/browser_startup.js index db34ca6beb9c..3c8739ec7686 100644 --- a/browser/base/content/test/performance/browser_startup.js +++ b/browser/base/content/test/performance/browser_startup.js @@ -92,8 +92,6 @@ const startupPhases = { // interacting with the first browser window. "before handling user events": {blacklist: { modules: new Set([ - "resource://gre/modules/FxAccounts.jsm", - "resource://gre/modules/FxAccountsStorage.jsm", "resource://gre/modules/LoginManagerContextMenu.jsm", "resource://gre/modules/Task.jsm", ]), diff --git a/services/sync/modules/UIState.jsm b/services/sync/modules/UIState.jsm index 943d693307bd..def0fe4edb17 100644 --- a/services/sync/modules/UIState.jsm +++ b/services/sync/modules/UIState.jsm @@ -72,9 +72,6 @@ const UIStateInternal = { init() { this._initialized = true; - if (!Services.prefs.prefHasUserValue("services.sync.username")) { - return; - } // Refresh the state in the background. this.refreshState().catch(e => { Cu.reportError(e);