Backed out changeset 8855ba3f65ba (bug 1397744) for failing browser-chrome's browser/components/customizableui/test/browser_synced_tabs_menu.js. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 28 Sep 2017 20:27:50 +0200
changeset 383541 a4c7a0be983302308f4485269de5218b66af1745
parent 383540 d2b23d922b73f0ed865bbf877d9bd715c7048043
child 383542 e365cc4aa8f1d3d7bfc6ace91522896cbaf3741a
push id52289
push userarchaeopteryx@coole-files.de
push dateThu, 28 Sep 2017 18:29:12 +0000
treeherderautoland@a4c7a0be9833 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1397744
milestone58.0a1
backs out8855ba3f65ba482513c0bfe322b351d4555d8619
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8855ba3f65ba (bug 1397744) for failing browser-chrome's browser/components/customizableui/test/browser_synced_tabs_menu.js. r=backout
browser/base/content/browser-sync.js
browser/components/customizableui/test/browser_synced_tabs_menu.js
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -519,17 +519,16 @@ var gSync = {
   // doSync forces a sync - it *does not* return a promise as it is called
   // via the various UI components.
   doSync() {
     if (!UIState.isReady()) {
       return;
     }
     const state = UIState.get();
     if (state.status == UIState.STATUS_SIGNED_IN) {
-      this.updateSyncStatus({ syncing: true });
       setTimeout(() => Weave.Service.errorHandler.syncAndReportErrors(), 0);
     }
   },
 
   openPrefs(entryPoint = "syncbutton", origin = undefined) {
     window.openPreferences("paneSync", { origin, urlParams: { entrypoint: entryPoint } });
   },
 
--- a/browser/components/customizableui/test/browser_synced_tabs_menu.js
+++ b/browser/components/customizableui/test/browser_synced_tabs_menu.js
@@ -2,17 +2,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 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");
 
 // These are available on the widget implementation, but it seems impossible
 // to grab that impl at runtime.
 const DECKINDEX_TABS = 0;
 const DECKINDEX_TABSDISABLED = 1;
 const DECKINDEX_FETCHING = 2;
@@ -44,22 +43,18 @@ add_task(async function setup() {
   SyncedTabs._internal = mockedInternal;
 
   // This test hacks some observer states to simulate a user being signed
   // in to Sync - restore them when the test completes.
   let initialObserverStates = {};
   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;
     }
   });
 });
 
 // The test expects the about:preferences#sync page to open in the current tab