Merging upstream version 115.11.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 98 deletions

diff --git a/browser/components/sessionstore/test/browser_history_persist.js b/browser/components/sessionstore/test/browser_history_persist.js
index b45a2b6779..4b098a9edb 100644
--- a/browser/components/sessionstore/test/browser_history_persist.js
+++ b/browser/components/sessionstore/test/browser_history_persist.js
@@ -25,54 +25,27 @@ add_task(async function check_history_not_persisted() {
   browser = tab.linkedBrowser;
   await promiseTabState(tab, state);
 
-  if (!SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(browser, [], function () {
-      let sessionHistory =
-        docShell.browsingContext.childSessionHistory.legacySHistory;
-
-      is(sessionHistory.count, 1, "Should be a single history entry");
-      is(
-        sessionHistory.getEntryAtIndex(0).URI.spec,
-        "about:blank",
-        "Should be the right URL"
-      );
-    });
-  } else {
-    let sessionHistory = browser.browsingContext.sessionHistory;
-
-    is(sessionHistory.count, 1, "Should be a single history entry");
-    is(
-      sessionHistory.getEntryAtIndex(0).URI.spec,
-      "about:blank",
-      "Should be the right URL"
-    );
-  }
+  let sessionHistory = browser.browsingContext.sessionHistory;
+
+  is(sessionHistory.count, 1, "Should be a single history entry");
+  is(
+    sessionHistory.getEntryAtIndex(0).URI.spec,
+    "about:blank",
+    "Should be the right URL"
+  );
 
   // Load a new URL into the tab, it should replace the about:blank history entry
   BrowserTestUtils.loadURIString(browser, "about:robots");
   await promiseBrowserLoaded(browser, false, "about:robots");
-  if (!SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(browser, [], function () {
-      let sessionHistory =
-        docShell.browsingContext.childSessionHistory.legacySHistory;
-
-      is(sessionHistory.count, 1, "Should be a single history entry");
-      is(
-        sessionHistory.getEntryAtIndex(0).URI.spec,
-        "about:robots",
-        "Should be the right URL"
-      );
-    });
-  } else {
-    let sessionHistory = browser.browsingContext.sessionHistory;
-
-    is(sessionHistory.count, 1, "Should be a single history entry");
-    is(
-      sessionHistory.getEntryAtIndex(0).URI.spec,
-      "about:robots",
-      "Should be the right URL"
-    );
-  }
+
+  sessionHistory = browser.browsingContext.sessionHistory;
+
+  is(sessionHistory.count, 1, "Should be a single history entry");
+  is(
+    sessionHistory.getEntryAtIndex(0).URI.spec,
+    "about:robots",
+    "Should be the right URL"
+  );
 
   // Cleanup.
   BrowserTestUtils.removeTab(tab);
@@ -99,64 +72,33 @@ add_task(async function check_history_default_persisted() {
   tab = BrowserTestUtils.addTab(gBrowser, "about:blank");
   browser = tab.linkedBrowser;
   await promiseTabState(tab, state);
-  if (!SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(browser, [], function () {
-      let sessionHistory =
-        docShell.browsingContext.childSessionHistory.legacySHistory;
-
-      is(sessionHistory.count, 1, "Should be a single history entry");
-      is(
-        sessionHistory.getEntryAtIndex(0).URI.spec,
-        "about:blank",
-        "Should be the right URL"
-      );
-    });
-  } else {
-    let sessionHistory = browser.browsingContext.sessionHistory;
-
-    is(sessionHistory.count, 1, "Should be a single history entry");
-    is(
-      sessionHistory.getEntryAtIndex(0).URI.spec,
-      "about:blank",
-      "Should be the right URL"
-    );
-  }
+
+  let sessionHistory = browser.browsingContext.sessionHistory;
+
+  is(sessionHistory.count, 1, "Should be a single history entry");
+  is(
+    sessionHistory.getEntryAtIndex(0).URI.spec,
+    "about:blank",
+    "Should be the right URL"
+  );
 
   // Load a new URL into the tab, it should replace the about:blank history entry
   BrowserTestUtils.loadURIString(browser, "about:robots");
   await promiseBrowserLoaded(browser, false, "about:robots");
-  if (!SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(browser, [], function () {
-      let sessionHistory =
-        docShell.browsingContext.childSessionHistory.legacySHistory;
-
-      is(sessionHistory.count, 2, "Should be two history entries");
-      is(
-        sessionHistory.getEntryAtIndex(0).URI.spec,
-        "about:blank",
-        "Should be the right URL"
-      );
-      is(
-        sessionHistory.getEntryAtIndex(1).URI.spec,
-        "about:robots",
-        "Should be the right URL"
-      );
-    });
-  } else {
-    let sessionHistory = browser.browsingContext.sessionHistory;
-
-    is(sessionHistory.count, 2, "Should be two history entries");
-    is(
-      sessionHistory.getEntryAtIndex(0).URI.spec,
-      "about:blank",
-      "Should be the right URL"
-    );
-    is(
-      sessionHistory.getEntryAtIndex(1).URI.spec,
-      "about:robots",
-      "Should be the right URL"
-    );
-  }
+
+  sessionHistory = browser.browsingContext.sessionHistory;
+
+  is(sessionHistory.count, 2, "Should be two history entries");
+  is(
+    sessionHistory.getEntryAtIndex(0).URI.spec,
+    "about:blank",
+    "Should be the right URL"
+  );
+  is(
+    sessionHistory.getEntryAtIndex(1).URI.spec,
+    "about:robots",
+    "Should be the right URL"
+  );
 
   // Cleanup.
   BrowserTestUtils.removeTab(tab);