Bug 1530980 - Stop listening for mail-startup-done to start Marionette in Thunderbird; r=whimboo
authorGeoff Lankow <geoff@darktrojan.net>
Sat, 09 Mar 2019 15:44:14 +1300
changeset 524238 ec939d4f81dcf0058ab4b9549083c7f4a9698fe8
parent 524237 d652c07b0c040250e7fe7dfcee4ed9d88a754bf7
child 524239 b486ad6d8c06d517316092a046a0a7c74baefc21
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1530980
milestone67.0a1
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
Bug 1530980 - Stop listening for mail-startup-done to start Marionette in Thunderbird; r=whimboo
testing/marionette/components/marionette.js
--- a/testing/marionette/components/marionette.js
+++ b/testing/marionette/components/marionette.js
@@ -326,17 +326,16 @@ class MarionetteParentProcess {
         } else {
           this.uninit();
         }
         break;
 
       case "profile-after-change":
         Services.obs.addObserver(this, "command-line-startup");
         Services.obs.addObserver(this, "sessionstore-windows-restored");
-        Services.obs.addObserver(this, "mail-startup-done");
         Services.obs.addObserver(this, "toplevel-window-ready");
         Services.obs.addObserver(this, "marionette-startup-requested");
 
         for (let [pref, value] of EnvironmentPrefs.from(ENV_PRESERVE_PREFS)) {
           Preferences.set(pref, value);
         }
         break;
 
@@ -381,21 +380,16 @@ class MarionetteParentProcess {
             let parserError = ev.target.querySelector("parsererror");
             log.fatal(parserError.textContent);
             this.uninit();
             Services.startup.quit(Ci.nsIAppStartup.eForceQuit);
           }
         }, {once: true});
         break;
 
-      // Thunderbird only, instead of sessionstore-windows-restored.
-      case "mail-startup-done":
-        Services.obs.notifyObservers(this, "marionette-startup-requested");
-        break;
-
       case "sessionstore-windows-restored":
         Services.obs.removeObserver(this, topic);
         Services.obs.removeObserver(this, "toplevel-window-ready");
 
         // When Firefox starts on Windows, an additional GFX sanity test
         // window may appear off-screen.  Marionette should wait for it
         // to close.
         for (let win of Services.wm.getEnumerator(null)) {