Bug 1458375 - Make sessionrestore tests wait for the browser-idle-startup-tasks-finished event. r?rwood draft
authorMike Conley <mconley@mozilla.com>
Tue, 29 May 2018 19:42:53 -0400
changeset 806910 ef4d49da4c626f2a27a392e2c76901b38dff564b
parent 806909 6f17cb7c594480ce5ea1d1c5af811c7fc2cdc200
child 806911 92ec32795505a3aede71010ea7e93b1d49800eb2
push id112986
push usermconley@mozilla.com
push dateTue, 12 Jun 2018 19:30:14 +0000
reviewersrwood
bugs1458375
milestone62.0a1
Bug 1458375 - Make sessionrestore tests wait for the browser-idle-startup-tasks-finished event. r?rwood MozReview-Commit-ID: ODltx5ywn
testing/talos/talos/startup_test/sessionrestore/addon/bootstrap.js
--- a/testing/talos/talos/startup_test/sessionrestore/addon/bootstrap.js
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/bootstrap.js
@@ -11,17 +11,17 @@ ChromeUtils.import("resource://gre/modul
 ChromeUtils.defineModuleGetter(this, "Services",
   "resource://gre/modules/Services.jsm");
 ChromeUtils.defineModuleGetter(this, "setTimeout",
   "resource://gre/modules/Timer.jsm");
 ChromeUtils.defineModuleGetter(this, "StartupPerformance",
   "resource:///modules/sessionstore/StartupPerformance.jsm");
 
 // Observer Service topics.
-const WINDOW_READY_TOPIC = "browser-delayed-startup-finished";
+const WINDOW_READY_TOPIC = "browser-idle-startup-tasks-finished";
 
 // Process Message Manager topics.
 const MSG_REQUEST = "session-restore-test?duration";
 const MSG_PROVIDE = "session-restore-test:duration";
 
 const sessionRestoreTest = {
   QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]),
 
@@ -68,17 +68,17 @@ const sessionRestoreTest = {
   onReady(hasRestoredTabs) {
     if (hasRestoredTabs) {
       Services.obs.removeObserver(this, StartupPerformance.RESTORED_TOPIC);
     }
 
     // onReady might fire before the browser window has finished initializing
     // or sometimes soon after. We handle both cases here.
     let win = Services.wm.getMostRecentWindow("navigator:browser");
-    if (!win || !win.gBrowserInit || !win.gBrowserInit.delayedStartupFinished) {
+    if (!win || !win.gBrowserInit || !win.gBrowserInit.idleTasksFinished) {
       // We didn't have a window around yet, so we'll wait until one becomes
       // available before opening the result tab.
       Services.obs.addObserver(this, WINDOW_READY_TOPIC);
     } else {
       // We have a window, so we can open the result tab in it right away.
       this.onWindow(win);
     }