Backed out changeset 8855ba3f65ba (bug 1397744) for failing browser-chrome's browser/components/customizableui/test/browser_synced_tabs_menu.js. r=backout
This commit is contained in:
@@ -524,7 +524,6 @@ var gSync = {
|
||||
}
|
||||
const state = UIState.get();
|
||||
if (state.status == UIState.STATUS_SIGNED_IN) {
|
||||
this.updateSyncStatus({ syncing: true });
|
||||
setTimeout(() => Weave.Service.errorHandler.syncAndReportErrors(), 0);
|
||||
}
|
||||
},
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
requestLongerTimeout(2);
|
||||
|
||||
let {SyncedTabs} = Cu.import("resource://services-sync/SyncedTabs.jsm", {});
|
||||
Cu.import("resource://services-sync/UIState.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyModuleGetter(this, "UITour", "resource:///modules/UITour.jsm");
|
||||
|
||||
@@ -49,12 +48,8 @@ add_task(async function setup() {
|
||||
for (let id of ["sync-reauth-state", "sync-setup-state", "sync-syncnow-state"]) {
|
||||
initialObserverStates[id] = document.getElementById(id).hidden;
|
||||
}
|
||||
let origNotifyStateUpdated = UIState._internal.notifyStateUpdated;
|
||||
// Sync start-up will interfere with our tests, don't let UIState send UI updates.
|
||||
UIState._internal.notifyStateUpdated = () => {};
|
||||
|
||||
registerCleanupFunction(() => {
|
||||
UIState._internal.notifyStateUpdated = origNotifyStateUpdated;
|
||||
SyncedTabs._internal = oldInternal;
|
||||
for (let [id, initial] of Object.entries(initialObserverStates)) {
|
||||
document.getElementById(id).hidden = initial;
|
||||
|
||||
Reference in New Issue
Block a user