Bug 1059007 - [e10s] Use TabState.flush() in session store tests (r=t…

…taubert)
rmottola · Nov 18, 2019 · 897ba12 · 897ba12
1 parent d78b5fe
commit 897ba12
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/browser/components/sessionstore/test/browser_history_cap.js b/browser/components/sessionstore/test/browser_history_cap.js
@@ -49,7 +49,7 @@ add_task(function *test_history_cap() {
 
   ss.setTabState(tab, JSON.stringify(tabState));
   yield promiseTabRestored(tab);
-  SyncHandlers.get(tab.linkedBrowser).flush();
+  TabState.flush(tab.linkedBrowser);
 
   let restoredTabState = JSON.parse(ss.getTabState(tab));
   is(restoredTabState.entries.length, maxBack1 + 1 + maxFwd1,
@@ -70,7 +70,7 @@ add_task(function *test_history_cap() {
 
   ss.setTabState(tab, JSON.stringify(tabState));
   yield promiseTabRestored(tab);
-  SyncHandlers.get(tab.linkedBrowser).flush();
+  TabState.flush(tab.linkedBrowser);
 
   restoredTabState = JSON.parse(ss.getTabState(tab));
   is(restoredTabState.entries.length, maxEntries,
@@ -89,7 +89,7 @@ add_task(function *test_history_cap() {
 
   ss.setTabState(tab, JSON.stringify(tabState));
   yield promiseTabRestored(tab);
-  SyncHandlers.get(tab.linkedBrowser).flush();
+  TabState.flush(tab.linkedBrowser);
 
   restoredTabState = JSON.parse(ss.getTabState(tab));
   is(restoredTabState.entries.length, 1 + maxFwd2,
@@ -108,7 +108,7 @@ add_task(function *test_history_cap() {
 
   ss.setTabState(tab, JSON.stringify(tabState));
   yield promiseTabRestored(tab);
-  SyncHandlers.get(tab.linkedBrowser).flush();
+  TabState.flush(tab.linkedBrowser);
 
   restoredTabState = JSON.parse(ss.getTabState(tab));
   is(restoredTabState.entries.length, maxBack2 + 1,

diff --git a/browser/components/sessionstore/test/browser_label_and_icon.js b/browser/components/sessionstore/test/browser_label_and_icon.js
@@ -25,7 +25,7 @@ add_task(function test_label_and_icon() {
   yield promiseBrowserLoaded(browser);
 
   // Retrieve the tab state.
-  SyncHandlers.get(browser).flush();
+  TabState.flush(browser);
   let state = ss.getTabState(tab);
   gBrowser.removeTab(tab);
   browser = null;

diff --git a/browser/components/sessionstore/test/browser_privatetabs.js b/browser/components/sessionstore/test/browser_privatetabs.js
@@ -30,7 +30,8 @@ add_task(function() {
     yield promiseBrowserLoaded(tab2.linkedBrowser);
 
     info("Flush to make sure chrome received all data.");
-    SyncHandlers.get(tab2.linkedBrowser).flush();
+    TabState.flush(tab1.linkedBrowser);
+    TabState.flush(tab2.linkedBrowser);
 
     info("Checking out state");
     yield SessionSaver.run();
@@ -77,7 +78,7 @@ add_task(function () {
   let tab = win.gBrowser.addTab("about:mozilla");
   let browser = tab.linkedBrowser;
   yield promiseBrowserLoaded(browser);
-  SyncHandlers.get(browser).flush();
+  TabState.flush(browser);
 
   // Check that we consider the tab as private.
   let state = JSON.parse(ss.getTabState(tab));

diff --git a/browser/components/sessionstore/test/browser_telemetry.js b/browser/components/sessionstore/test/browser_telemetry.js
@@ -59,12 +59,13 @@ add_task(function history() {
   let tab = gBrowser.addTab("http://example.org:80/?");
   yield promiseBrowserLoaded(tab.linkedBrowser);
   try {
-    SyncHandlers.get(tab.linkedBrowser).flush();
+    TabState.flush(tab.linkedBrowser);
     let statistics = yield promiseStats();
 
     info("Now changing history");
-    tab.linkedBrowser.contentWindow.history.pushState({foo:1}, "ref");
-    SyncHandlers.get(tab.linkedBrowser).flush();
+    tab.linkedBrowser.loadURI("http://example.org:80/1");
+    yield promiseBrowserLoaded(tab.linkedBrowser);
+    TabState.flush(tab.linkedBrowser);
     let statistics2 = yield promiseStats();
 
     // We have changed history, so it must have increased
@@ -91,7 +92,7 @@ add_task(function close_tab() {
   let tab = gBrowser.addTab("http://example.org:80/?close_tab");
   yield promiseBrowserLoaded(tab.linkedBrowser);
   try {
-    SyncHandlers.get(tab.linkedBrowser).flush();
+    TabState.flush(tab.linkedBrowser);
     let statistics = yield promiseStats();
 
     info("Now closing a tab");
@@ -184,12 +185,12 @@ add_task(function dom_storage() {
   let tab = gBrowser.addTab("http://example.org:80/?dom_storage");
   yield promiseBrowserLoaded(tab.linkedBrowser);
   try {
-    SyncHandlers.get(tab.linkedBrowser).flush();
+    TabState.flush(tab.linkedBrowser);
     let statistics = yield promiseStats();
 
     info("Now adding some storage");
     yield modifySessionStorage(tab.linkedBrowser, {foo: "bar"});
-    SyncHandlers.get(tab.linkedBrowser).flush();
+    TabState.flush(tab.linkedBrowser);
 
     let statistics2 = yield promiseStats();
 
@@ -217,14 +218,13 @@ add_task(function formdata() {
   let tab = gBrowser.addTab("data:text/html;charset=utf-8,<input%20id='input'>");
   yield promiseBrowserLoaded(tab.linkedBrowser);
   try {
-    SyncHandlers.get(tab.linkedBrowser).flush();
+    TabState.flush(tab.linkedBrowser);
     let statistics = yield promiseStats();
 
     info("Now changing form data");
 
     yield modifyFormData(tab.linkedBrowser, {input: "This is some form data "});
-    SyncHandlers.get(tab.linkedBrowser).flush();
-    TabStateCache.delete(tab.linkedBrowser);
+    TabState.flush(tab.linkedBrowser);
 
     let statistics2 = yield promiseStats();
 

diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
@@ -31,6 +31,7 @@ Cu.import("resource:///modules/sessionstore/SessionStore.jsm", tmp);
 Cu.import("resource:///modules/sessionstore/SessionSaver.jsm", tmp);
 Cu.import("resource:///modules/sessionstore/SessionFile.jsm", tmp);
 Cu.import("resource:///modules/sessionstore/TabState.jsm", tmp);
+Cu.import("resource:///modules/sessionstore/TabState.jsm", tmp);
 let {Promise, Task, SessionStore, SessionSaver, SessionFile, TabState} = tmp;
 
 let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);