Bug 1706445 - Fix test helpers that use "SessionStore:update", r=nika,perftest-reviewers,sparky

Also skips a frame script OOM test for Fission.

Differential Revision: https://phabricator.services.mozilla.com/D115930

browser/components/sessionstore/test/browser.ini

@@ -289,6 +289,7 @@ skip-if = verify && debug
 run-if = e10s
 tags = openUILinkIn
 [browser_send_async_message_oom.js]
+skip-if = fission # Tests that the frame script OOMs, which is unused in Fission.
 [browser_sessionStoreContainer.js]
 [browser_windowStateContainer.js]
 [browser_1234021.js]

testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm

@@ -1119,6 +1119,7 @@ var BrowserTestUtils = {
     let domWinClosedPromise = BrowserTestUtils.domWindowClosed(win);
     let promises = [domWinClosedPromise];
     let winType = win.document.documentElement.getAttribute("windowtype");
+    let flushTopic = "sessionstore-browser-shutdown-flush";
 
     if (winType == "navigator:browser") {
       let finalMsgsPromise = new Promise(resolve => {
@@ -1128,24 +1129,21 @@ var BrowserTestUtils = {
         browserSet.forEach(browser => {
           win.gBrowser._insertBrowser(win.gBrowser.getTabForBrowser(browser));
         });
-        let mm = win.getGroupMessageManager("browsers");
 
-        mm.addMessageListener(
+        let observer = (subject, topic, data) => {
-          "SessionStore:update",
+          if (browserSet.has(subject)) {
-          function onMessage(msg) {
+            browserSet.delete(subject);
-            if (browserSet.has(msg.target) && msg.data.isFinal) {
+          }
-              browserSet.delete(msg.target);
+          if (!browserSet.size) {
-              if (!browserSet.size) {
+            Services.obs.removeObserver(observer, flushTopic);
-                mm.removeMessageListener("SessionStore:update", onMessage);
+            // Give the TabStateFlusher a chance to react to this final
-                // Give the TabStateFlusher a chance to react to this final
+            // update and for the TabStateFlusher.flushWindow promise
-                // update and for the TabStateFlusher.flushWindow promise
+            // to resolve before we resolve.
-                // to resolve before we resolve.
+            TestUtils.executeSoon(resolve);
-                TestUtils.executeSoon(resolve);
+          }
-              }
+        };
-            }
+
-          },
+        Services.obs.addObserver(observer, flushTopic);
-          true
-        );
       });
 
       promises.push(finalMsgsPromise);
@@ -1165,19 +1163,17 @@ var BrowserTestUtils = {
    */
   waitForSessionStoreUpdate(tab) {
     return new Promise(resolve => {
-      let { messageManager: mm, frameLoader } = tab.linkedBrowser;
+      let browser = tab.linkedBrowser;
-      mm.addMessageListener(
+      let flushTopic = "sessionstore-browser-shutdown-flush";
-        "SessionStore:update",
+      let observer = (subject, topic, data) => {
-        function onMessage(msg) {
+        if (subject === browser) {
-          if (msg.targetFrameLoader == frameLoader && msg.data.isFinal) {
+          Services.obs.removeObserver(observer, flushTopic);
-            mm.removeMessageListener("SessionStore:update", onMessage);
+          // Wait for the next event tick to make sure other listeners are
-            // Wait for the next event tick to make sure other listeners are
+          // called.
-            // called.
+          TestUtils.executeSoon(() => resolve());
-            TestUtils.executeSoon(() => resolve());
+        }
-          }
+      };
-        },
+      Services.obs.addObserver(observer, flushTopic);
-        true
-      );
     });
   },
 

testing/talos/talos/tests/cpstartup/extension/api.js

@@ -23,6 +23,7 @@ ChromeUtils.defineModuleGetter(
 
 const PREALLOCATED_PREF = "dom.ipc.processPrelaunch.enabled";
 const MESSAGES = ["CPStartup:Go", "CPStartup:BrowserChildReady"];
+const BROWSER_FLUSH_TOPIC = "sessionstore-browser-shutdown-flush";
 let domainID = 1;
 
 /* global ExtensionAPI */
@@ -117,18 +118,14 @@ this.cpstartup = class extends ExtensionAPI {
 
   removeTab(tab) {
     return new Promise(resolve => {
-      let { messageManager: mm, frameLoader } = tab.linkedBrowser;
+      let browser = tab.linkedBrowser;
-      mm.addMessageListener(
+      let observer = (subject, topic, data) => {
-        "SessionStore:update",
+        if (subject === browser) {
-        function onMessage(msg) {
+          Services.obs.removeObserver(observer, BROWSER_FLUSH_TOPIC);
-          if (msg.targetFrameLoader == frameLoader && msg.data.isFinal) {
+          resolve();
-            mm.removeMessageListener("SessionStore:update", onMessage);
+        }
-            resolve();
+      };
-          }
+      Services.obs.addObserver(observer, BROWSER_FLUSH_TOPIC);
-        },
-        true
-      );
-
       tab.ownerGlobal.gBrowser.removeTab(tab);
     });
   }

testing/talos/talos/tests/tabpaint/api.js

@@ -36,6 +36,8 @@ const MULTI_OPT_OUT_PREF = "dom.ipc.multiOptOut";
 
 const MESSAGES = ["TabPaint:Go", "TabPaint:Painted"];
 
+const BROWSER_FLUSH_TOPIC = "sessionstore-browser-shutdown-flush";
+
 /* globals ExtensionAPI */
 this.tabpaint = class extends ExtensionAPI {
   onStartup() {
@@ -201,18 +203,14 @@ this.tabpaint = class extends ExtensionAPI {
   removeTab(tab) {
     TalosParentProfiler.mark("Tabpaint: Remove Tab");
     return new Promise(resolve => {
-      let { messageManager: mm, frameLoader } = tab.linkedBrowser;
+      let browser = tab.linkedBrowser;
-      mm.addMessageListener(
+      let observer = (subject, topic, data) => {
-        "SessionStore:update",
+        if (subject === browser) {
-        function onMessage(msg) {
+          Services.obs.removeObserver(observer, BROWSER_FLUSH_TOPIC);
-          if (msg.targetFrameLoader == frameLoader && msg.data.isFinal) {
+          resolve();
-            mm.removeMessageListener("SessionStore:update", onMessage);
+        }
-            resolve();
+      };
-          }
+      Services.obs.addObserver(observer, BROWSER_FLUSH_TOPIC);
-        },
-        true
-      );
-
       tab.ownerGlobal.gBrowser.removeTab(tab);
     });
   }