Merging upstream version 115.11.0esr.

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

31 files changed, 336 insertions, 2220 deletions

diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
index f56e1f0a01..678e923d5c 100644
--- a/browser/base/content/tabbrowser.js
+++ b/browser/base/content/tabbrowser.js
@@ -2128,18 +2128,6 @@
       // doesn't keep the window alive.
       b.permanentKey = new (Cu.getGlobalForObject(Services).Object)();
 
-      // Ensure that SessionStore has flushed any session history state from the
-      // content process before we this browser's remoteness.
-      if (!Services.appinfo.sessionHistoryInParent) {
-        b.prepareToChangeRemoteness = () =>
-          SessionStore.prepareToChangeRemoteness(b);
-        b.afterChangeRemoteness = switchId => {
-          let tab = this.getTabForBrowser(b);
-          SessionStore.finishTabRemotenessChange(tab, switchId);
-          return true;
-        };
-      }
-
       const defaultBrowserAttributes = {
         contextmenu: "contentAreaContextMenu",
         message: "true",
diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js
index 330f9b7655..fa7bef7ae9 100644
--- a/browser/base/content/test/performance/browser_startup_content.js
+++ b/browser/base/content/test/performance/browser_startup_content.js
@@ -55,12 +55,6 @@ const known_scripts = {
   ]),
 };
 
-if (!Services.appinfo.sessionHistoryInParent) {
-  known_scripts.modules.add(
-    "resource:///modules/sessionstore/ContentSessionStore.sys.mjs"
-  );
-}
-
 if (AppConstants.NIGHTLY_BUILD) {
   // Browser front-end.
   known_scripts.modules.add("resource:///actors/InteractionsChild.sys.mjs");
@@ -71,7 +65,6 @@ if (AppConstants.NIGHTLY_BUILD) {
 const intermittently_loaded_scripts = {
   modules: new Set([
     "resource://gre/modules/nsAsyncShutdown.sys.mjs",
-    "resource://gre/modules/sessionstore/Utils.sys.mjs",
 
     // Translations code which may be preffed on.
     "resource://gre/actors/TranslationsChild.sys.mjs",
diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
index 86c5e1b786..72888a7248 100644
--- a/browser/components/customizableui/CustomizeMode.sys.mjs
+++ b/browser/components/customizableui/CustomizeMode.sys.mjs
@@ -27,7 +27,6 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   DragPositionManager: "resource:///modules/DragPositionManager.sys.mjs",
-  SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
   URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs",
 });
 ChromeUtils.defineModuleGetter(
@@ -225,7 +224,6 @@ CustomizeMode.prototype = {
     gTab = aTab;
 
     gTab.setAttribute("customizemode", "true");
-    lazy.SessionStore.persistTabAttribute("customizemode");
 
     if (gTab.linkedPanel) {
       gTab.linkedBrowser.stop();
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
index 8ad1349441..858c5ba7dc 100644
--- a/browser/components/enterprisepolicies/Policies.sys.mjs
+++ b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -1725,6 +1725,8 @@ export var Policies = {
         "places.",
         "pref.",
         "print.",
+        "privacy.userContext.enabled",
+        "privacy.userContext.ui.enabled",
         "signon.",
         "spellchecker.",
         "toolkit.legacyUserProfileCustomizations.stylesheets",
@@ -1904,13 +1906,11 @@ export var Policies = {
     onBeforeAddons(manager, param) {
       if (param.Locked) {
         manager.disallowFeature("changeProxySettings");
-        lazy.ProxyPolicies.configureProxySettings(param, setAndLockPref);
-      } else {
-        lazy.ProxyPolicies.configureProxySettings(
-          param,
-          PoliciesUtils.setDefaultPref
-        );
       }
+      lazy.ProxyPolicies.configureProxySettings(
+        param,
+        PoliciesUtils.setDefaultPref
+      );
     },
   },
 
diff --git a/browser/components/enterprisepolicies/helpers/ProxyPolicies.sys.mjs b/browser/components/enterprisepolicies/helpers/ProxyPolicies.sys.mjs
index 8f2ba0b2a2..148984a055 100644
--- a/browser/components/enterprisepolicies/helpers/ProxyPolicies.sys.mjs
+++ b/browser/components/enterprisepolicies/helpers/ProxyPolicies.sys.mjs
@@ -31,6 +31,22 @@ export var PROXY_TYPES_MAP = new Map([
   ["autoConfig", Ci.nsIProtocolProxyService.PROXYCONFIG_PAC],
 ]);
 
+let proxyPreferences = [
+  "network.proxy.type",
+  "network.proxy.autoconfig_url",
+  "network.proxy.socks_remote_dns",
+  "signon.autologin.proxy",
+  "network.proxy.socks_version",
+  "network.proxy.no_proxies_on",
+  "network.proxy.share_proxy_settings",
+  "network.proxy.http",
+  "network.proxy.http_port",
+  "network.proxy.ssl",
+  "network.proxy.ssl_port",
+  "network.proxy.socks",
+  "network.proxy.socks_port",
+];
+
 export var ProxyPolicies = {
   configureProxySettings(param, setPref) {
     if (param.Mode) {
@@ -107,5 +123,13 @@ export var ProxyPolicies = {
     if (param.SOCKSProxy) {
       setProxyHostAndPort("socks", param.SOCKSProxy);
     }
+
+    // All preferences should be locked regardless of whether or not a
+    // specific value was set.
+    if (param.Locked) {
+      for (let preference of proxyPreferences) {
+        Services.prefs.lockPref(preference);
+      }
+    }
   },
 };
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
index 0a8d77d483..1468fcd46c 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
@@ -1034,6 +1034,18 @@ const POLICIES_TESTS = [
       "extensions.formautofill.creditCards.enabled": false,
     },
   },
+
+  // POLICY: Proxy - locking if no values are set
+  {
+    policies: {
+      Proxy: {
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "network.proxy.type": 5,
+    },
+  },
 ];
 
 add_task(async function test_policy_simple_prefs() {
diff --git a/browser/components/sessionstore/ContentRestore.sys.mjs b/browser/components/sessionstore/ContentRestore.sys.mjs
deleted file mode 100644
index e55772cab3..0000000000
--- a/browser/components/sessionstore/ContentRestore.sys.mjs
+++ /dev/null
@@ -1,435 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const lazy = {};
-
-ChromeUtils.defineESModuleGetters(lazy, {
-  SessionHistory: "resource://gre/modules/sessionstore/SessionHistory.sys.mjs",
-  Utils: "resource://gre/modules/sessionstore/Utils.sys.mjs",
-});
-
-/**
- * This module implements the content side of session restoration. The chrome
- * side is handled by SessionStore.sys.mjs. The functions in this module are called
- * by content-sessionStore.js based on messages received from SessionStore.sys.mjs
- * (or, in one case, based on a "load" event). Each tab has its own
- * ContentRestore instance, constructed by content-sessionStore.js.
- *
- * In a typical restore, content-sessionStore.js will call the following based
- * on messages and events it receives:
- *
- *   restoreHistory(tabData, loadArguments, callbacks)
- *     Restores the tab's history and session cookies.
- *   restoreTabContent(loadArguments, finishCallback)
- *     Starts loading the data for the current page to restore.
- *   restoreDocument()
- *     Restore form and scroll data.
- *
- * When the page has been loaded from the network, we call finishCallback. It
- * should send a message to SessionStore.sys.mjs, which may cause other tabs to be
- * restored.
- *
- * When the page has finished loading, a "load" event will trigger in
- * content-sessionStore.js, which will call restoreDocument. At that point,
- * form data is restored and the restore is complete.
- *
- * At any time, SessionStore.sys.mjs can cancel the ongoing restore by sending a
- * reset message, which causes resetRestore to be called. At that point it's
- * legal to begin another restore.
- */
-export function ContentRestore(chromeGlobal) {
-  let internal = new ContentRestoreInternal(chromeGlobal);
-  let external = {};
-
-  let EXPORTED_METHODS = [
-    "restoreHistory",
-    "restoreTabContent",
-    "restoreDocument",
-    "resetRestore",
-  ];
-
-  for (let method of EXPORTED_METHODS) {
-    external[method] = internal[method].bind(internal);
-  }
-
-  return Object.freeze(external);
-}
-
-function ContentRestoreInternal(chromeGlobal) {
-  this.chromeGlobal = chromeGlobal;
-
-  // The following fields are only valid during certain phases of the restore
-  // process.
-
-  // The tabData for the restore. Set in restoreHistory and removed in
-  // restoreTabContent.
-  this._tabData = null;
-
-  // Contains {entry, scrollPositions, formdata}, where entry is a
-  // single entry from the tabData.entries array. Set in
-  // restoreTabContent and removed in restoreDocument.
-  this._restoringDocument = null;
-
-  // This listener is used to detect reloads on restoring tabs. Set in
-  // restoreHistory and removed in restoreTabContent.
-  this._historyListener = null;
-
-  // This listener detects when a pending tab starts loading (when not
-  // initiated by sessionstore) and when a restoring tab has finished loading
-  // data from the network. Set in restoreHistory() and restoreTabContent(),
-  // removed in resetRestore().
-  this._progressListener = null;
-}
-
-/**
- * The API for the ContentRestore module. Methods listed in EXPORTED_METHODS are
- * public.
- */
-ContentRestoreInternal.prototype = {
-  get docShell() {
-    return this.chromeGlobal.docShell;
-  },
-
-  /**
-   * Starts the process of restoring a tab. The tabData to be restored is passed
-   * in here and used throughout the restoration. The epoch (which must be
-   * non-zero) is passed through to all the callbacks. If a load in the tab
-   * is started while it is pending, the appropriate callbacks are called.
-   */
-  restoreHistory(tabData, loadArguments, callbacks) {
-    this._tabData = tabData;
-
-    // In case about:blank isn't done yet.
-    let webNavigation = this.docShell.QueryInterface(Ci.nsIWebNavigation);
-    webNavigation.stop(Ci.nsIWebNavigation.STOP_ALL);
-
-    // Make sure currentURI is set so that switch-to-tab works before the tab is
-    // restored. We'll reset this to about:blank when we try to restore the tab
-    // to ensure that docshell doeesn't get confused. Don't bother doing this if
-    // we're restoring immediately due to a process switch. It just causes the
-    // URL bar to be temporarily blank.
-    let activeIndex = tabData.index - 1;
-    let activePageData = tabData.entries[activeIndex] || {};
-    let uri = activePageData.url || null;
-    if (uri && !loadArguments) {
-      webNavigation.setCurrentURIForSessionStore(Services.io.newURI(uri));
-    }
-
-    lazy.SessionHistory.restore(this.docShell, tabData);
-
-    // Add a listener to watch for reloads.
-    let listener = new HistoryListener(this.docShell, () => {
-      // On reload, restore tab contents.
-      this.restoreTabContent(null, false, callbacks.onLoadFinished);
-    });
-
-    webNavigation.sessionHistory.legacySHistory.addSHistoryListener(listener);
-    this._historyListener = listener;
-
-    // Make sure to reset the capabilities and attributes in case this tab gets
-    // reused.
-    SessionStoreUtils.restoreDocShellCapabilities(
-      this.docShell,
-      tabData.disallow
-    );
-
-    // Add a progress listener to correctly handle browser.loadURI()
-    // calls from foreign code.
-    this._progressListener = new ProgressListener(this.docShell, {
-      onStartRequest: () => {
-        // Some code called browser.loadURI() on a pending tab. It's safe to
-        // assume we don't care about restoring scroll or form data.
-        this._tabData = null;
-
-        // Listen for the tab to finish loading.
-        this.restoreTabContentStarted(callbacks.onLoadFinished);
-
-        // Notify the parent.
-        callbacks.onLoadStarted();
-      },
-    });
-  },
-
-  /**
-   * Start loading the current page. When the data has finished loading from the
-   * network, finishCallback is called. Returns true if the load was successful.
-   */
-  restoreTabContent(loadArguments, isRemotenessUpdate, finishCallback) {
-    let tabData = this._tabData;
-    this._tabData = null;
-
-    let webNavigation = this.docShell.QueryInterface(Ci.nsIWebNavigation);
-
-    // Listen for the tab to finish loading.
-    this.restoreTabContentStarted(finishCallback);
-
-    // Reset the current URI to about:blank. We changed it above for
-    // switch-to-tab, but now it must go back to the correct value before the
-    // load happens. Don't bother doing this if we're restoring immediately
-    // due to a process switch.
-    if (!isRemotenessUpdate) {
-      webNavigation.setCurrentURIForSessionStore(
-        Services.io.newURI("about:blank")
-      );
-    }
-
-    try {
-      if (loadArguments) {
-        // If the load was started in another process, and the in-flight channel
-        // was redirected into this process, resume that load within our process.
-        //
-        // NOTE: In this case `isRemotenessUpdate` must be true.
-        webNavigation.resumeRedirectedLoad(
-          loadArguments.redirectLoadSwitchId,
-          loadArguments.redirectHistoryIndex
-        );
-      } else if (tabData.userTypedValue && tabData.userTypedClear) {
-        // If the user typed a URL into the URL bar and hit enter right before
-        // we crashed, we want to start loading that page again. A non-zero
-        // userTypedClear value means that the load had started.
-        // Load userTypedValue and fix up the URL if it's partial/broken.
-        let loadURIOptions = {
-          triggeringPrincipal:
-            Services.scriptSecurityManager.getSystemPrincipal(),
-          loadFlags: Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP,
-        };
-        webNavigation.fixupAndLoadURIString(
-          tabData.userTypedValue,
-          loadURIOptions
-        );
-      } else if (tabData.entries.length) {
-        // Stash away the data we need for restoreDocument.
-        this._restoringDocument = {
-          formdata: tabData.formdata || {},
-          scrollPositions: tabData.scroll || {},
-        };
-
-        // In order to work around certain issues in session history, we need to
-        // force session history to update its internal index and call reload
-        // instead of gotoIndex. See bug 597315.
-        let history = webNavigation.sessionHistory.legacySHistory;
-        history.reloadCurrentEntry();
-      } else {
-        // If there's nothing to restore, we should still blank the page.
-        let loadURIOptions = {
-          triggeringPrincipal:
-            Services.scriptSecurityManager.getSystemPrincipal(),
-          loadFlags: Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_HISTORY,
-          // Specify an override to force the load to finish in the current
-          // process, as tests rely on this behaviour for non-fission session
-          // restore.
-          remoteTypeOverride: Services.appinfo.remoteType,
-        };
-        webNavigation.loadURI(
-          Services.io.newURI("about:blank"),
-          loadURIOptions
-        );
-      }
-
-      return true;
-    } catch (ex) {
-      if (ex instanceof Ci.nsIException) {
-        // Ignore page load errors, but return false to signal that the load never
-        // happened.
-        return false;
-      }
-    }
-    return null;
-  },
-
-  /**
-   * To be called after restoreHistory(). Removes all listeners needed for
-   * pending tabs and makes sure to notify when the tab finished loading.
-   */
-  restoreTabContentStarted(finishCallback) {
-    // The reload listener is no longer needed.
-    this._historyListener.uninstall();
-    this._historyListener = null;
-
-    // Remove the old progress listener.
-    this._progressListener.uninstall();
-
-    // We're about to start a load. This listener will be called when the load
-    // has finished getting everything from the network.
-    this._progressListener = new ProgressListener(this.docShell, {
-      onStopRequest: () => {
-        // Call resetRestore() to reset the state back to normal. The data
-        // needed for restoreDocument() (which hasn't happened yet) will
-        // remain in _restoringDocument.
-        this.resetRestore();
-
-        finishCallback();
-      },
-    });
-  },
-
-  /**
-   * Finish restoring the tab by filling in form data and setting the scroll
-   * position. The restore is complete when this function exits. It should be
-   * called when the "load" event fires for the restoring tab.  Returns true
-   * if we're restoring a document.
-   */
-  restoreDocument() {
-    if (!this._restoringDocument) {
-      return;
-    }
-
-    let { formdata, scrollPositions } = this._restoringDocument;
-    this._restoringDocument = null;
-
-    let window = this.docShell.domWindow;
-
-    // Restore form data.
-    lazy.Utils.restoreFrameTreeData(window, formdata, (frame, data) => {
-      // restore() will return false, and thus abort restoration for the
-      // current |frame| and its descendants, if |data.url| is given but
-      // doesn't match the loaded document's URL.
-      return SessionStoreUtils.restoreFormData(frame.document, data);
-    });
-
-    // Restore scroll data.
-    lazy.Utils.restoreFrameTreeData(window, scrollPositions, (frame, data) => {
-      if (data.scroll) {
-        SessionStoreUtils.restoreScrollPosition(frame, data);
-      }
-    });
-  },
-
-  /**
-   * Cancel an ongoing restore. This function can be called any time between
-   * restoreHistory and restoreDocument.
-   *
-   * This function is called externally (if a restore is canceled) and
-   * internally (when the loads for a restore have finished). In the latter
-   * case, it's called before restoreDocument, so it cannot clear
-   * _restoringDocument.
-   */
-  resetRestore() {
-    this._tabData = null;
-
-    if (this._historyListener) {
-      this._historyListener.uninstall();
-    }
-    this._historyListener = null;
-
-    if (this._progressListener) {
-      this._progressListener.uninstall();
-    }
-    this._progressListener = null;
-  },
-};
-
-/*
- * This listener detects when a page being restored is reloaded. It triggers a
- * callback and cancels the reload. The callback will send a message to
- * SessionStore.sys.mjs so that it can restore the content immediately.
- */
-function HistoryListener(docShell, callback) {
-  let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
-  webNavigation.sessionHistory.legacySHistory.addSHistoryListener(this);
-
-  this.webNavigation = webNavigation;
-  this.callback = callback;
-}
-HistoryListener.prototype = {
-  QueryInterface: ChromeUtils.generateQI([
-    "nsISHistoryListener",
-    "nsISupportsWeakReference",
-  ]),
-
-  uninstall() {
-    let shistory = this.webNavigation.sessionHistory.legacySHistory;
-    if (shistory) {
-      shistory.removeSHistoryListener(this);
-    }
-  },
-
-  OnHistoryGotoIndex() {},
-  OnHistoryPurge() {},
-  OnHistoryReplaceEntry() {},
-
-  // This will be called for a pending tab when loadURI(uri) is called where
-  // the given |uri| only differs in the fragment.
-  OnHistoryNewEntry(newURI) {
-    let currentURI = this.webNavigation.currentURI;
-
-    // Ignore new SHistory entries with the same URI as those do not indicate
-    // a navigation inside a document by changing the #hash part of the URL.
-    // We usually hit this when purging session history for browsers.
-    if (currentURI && currentURI.spec == newURI.spec) {
-      return;
-    }
-
-    // Reset the tab's URL to what it's actually showing. Without this loadURI()
-    // would use the current document and change the displayed URL only.
-    this.webNavigation.setCurrentURIForSessionStore(
-      Services.io.newURI("about:blank")
-    );
-
-    // Kick off a new load so that we navigate away from about:blank to the
-    // new URL that was passed to loadURI(). The new load will cause a
-    // STATE_START notification to be sent and the ProgressListener will then
-    // notify the parent and do the rest.
-    let loadFlags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
-    let loadURIOptions = {
-      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-      loadFlags,
-    };
-    this.webNavigation.loadURI(newURI, loadURIOptions);
-  },
-
-  OnHistoryReload() {
-    this.callback();
-
-    // Cancel the load.
-    return false;
-  },
-};
-
-/**
- * This class informs SessionStore.sys.mjs whenever the network requests for a
- * restoring page have completely finished. We only restore three tabs
- * simultaneously, so this is the signal for SessionStore.sys.mjs to kick off
- * another restore (if there are more to do).
- *
- * The progress listener is also used to be notified when a load not initiated
- * by sessionstore starts. Pending tabs will then need to be marked as no
- * longer pending.
- */
-function ProgressListener(docShell, callbacks) {
-  let webProgress = docShell
-    .QueryInterface(Ci.nsIInterfaceRequestor)
-    .getInterface(Ci.nsIWebProgress);
-  webProgress.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_WINDOW);
-
-  this.webProgress = webProgress;
-  this.callbacks = callbacks;
-}
-
-ProgressListener.prototype = {
-  QueryInterface: ChromeUtils.generateQI([
-    "nsIWebProgressListener",
-    "nsISupportsWeakReference",
-  ]),
-
-  uninstall() {
-    this.webProgress.removeProgressListener(this);
-  },
-
-  onStateChange(webProgress, request, stateFlags, status) {
-    let { STATE_IS_WINDOW, STATE_STOP, STATE_START } =
-      Ci.nsIWebProgressListener;
-    if (!webProgress.isTopLevel || !(stateFlags & STATE_IS_WINDOW)) {
-      return;
-    }
-
-    if (stateFlags & STATE_START && this.callbacks.onStartRequest) {
-      this.callbacks.onStartRequest();
-    }
-
-    if (stateFlags & STATE_STOP && this.callbacks.onStopRequest) {
-      this.callbacks.onStopRequest();
-    }
-  },
-};
diff --git a/browser/components/sessionstore/ContentSessionStore.sys.mjs b/browser/components/sessionstore/ContentSessionStore.sys.mjs
deleted file mode 100644
index 61aa911f0b..0000000000
--- a/browser/components/sessionstore/ContentSessionStore.sys.mjs
+++ /dev/null
@@ -1,686 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-import {
-  clearTimeout,
-  setTimeoutWithTarget,
-} from "resource://gre/modules/Timer.sys.mjs";
-
-const lazy = {};
-
-ChromeUtils.defineESModuleGetters(lazy, {
-  ContentRestore: "resource:///modules/sessionstore/ContentRestore.sys.mjs",
-  SessionHistory: "resource://gre/modules/sessionstore/SessionHistory.sys.mjs",
-});
-
-// This pref controls whether or not we send updates to the parent on a timeout
-// or not, and should only be used for tests or debugging.
-const TIMEOUT_DISABLED_PREF = "browser.sessionstore.debug.no_auto_updates";
-
-const PREF_INTERVAL = "browser.sessionstore.interval";
-
-const kNoIndex = Number.MAX_SAFE_INTEGER;
-const kLastIndex = Number.MAX_SAFE_INTEGER - 1;
-
-class Handler {
-  constructor(store) {
-    this.store = store;
-  }
-
-  get contentRestore() {
-    return this.store.contentRestore;
-  }
-
-  get contentRestoreInitialized() {
-    return this.store.contentRestoreInitialized;
-  }
-
-  get mm() {
-    return this.store.mm;
-  }
-
-  get messageQueue() {
-    return this.store.messageQueue;
-  }
-}
-
-/**
- * Listens for and handles content events that we need for the
- * session store service to be notified of state changes in content.
- */
-class EventListener extends Handler {
-  constructor(store) {
-    super(store);
-
-    SessionStoreUtils.addDynamicFrameFilteredListener(
-      this.mm,
-      "load",
-      this,
-      true
-    );
-  }
-
-  handleEvent(event) {
-    let { content } = this.mm;
-
-    // Ignore load events from subframes.
-    if (event.target != content.document) {
-      return;
-    }
-
-    if (content.document.documentURI.startsWith("about:reader")) {
-      if (
-        event.type == "load" &&
-        !content.document.body.classList.contains("loaded")
-      ) {
-        // Don't restore the scroll position of an about:reader page at this
-        // point; listen for the custom event dispatched from AboutReader.sys.mjs.
-        content.addEventListener("AboutReaderContentReady", this);
-        return;
-      }
-
-      content.removeEventListener("AboutReaderContentReady", this);
-    }
-
-    if (this.contentRestoreInitialized) {
-      // Restore the form data and scroll position.
-      this.contentRestore.restoreDocument();
-    }
-  }
-}
-
-/**
- * Listens for changes to the session history. Whenever the user navigates
- * we will collect URLs and everything belonging to session history.
- *
- * Causes a SessionStore:update message to be sent that contains the current
- * session history.
- *
- * Example:
- *   {entries: [{url: "about:mozilla", ...}, ...], index: 1}
- */
-class SessionHistoryListener extends Handler {
-  constructor(store) {
-    super(store);
-
-    this._fromIdx = kNoIndex;
-
-    // By adding the SHistoryListener immediately, we will unfortunately be
-    // notified of every history entry as the tab is restored. We don't bother
-    // waiting to add the listener later because these notifications are cheap.
-    // We will likely only collect once since we are batching collection on
-    // a delay.
-    this.mm.docShell
-      .QueryInterface(Ci.nsIWebNavigation)
-      .sessionHistory.legacySHistory.addSHistoryListener(this); // OK in non-geckoview
-
-    let webProgress = this.mm.docShell
-      .QueryInterface(Ci.nsIInterfaceRequestor)
-      .getInterface(Ci.nsIWebProgress);
-
-    webProgress.addProgressListener(
-      this,
-      Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT
-    );
-
-    // Collect data if we start with a non-empty shistory.
-    if (!lazy.SessionHistory.isEmpty(this.mm.docShell)) {
-      this.collect();
-      // When a tab is detached from the window, for the new window there is a
-      // new SessionHistoryListener created. Normally it is empty at this point
-      // but in a test env. the initial about:blank might have a children in which
-      // case we fire off a history message here with about:blank in it. If we
-      // don't do it ASAP then there is going to be a browser swap and the parent
-      // will be all confused by that message.
-      this.store.messageQueue.send();
-    }
-
-    // Listen for page title changes.
-    this.mm.addEventListener("DOMTitleChanged", this);
-  }
-
-  get mm() {
-    return this.store.mm;
-  }
-
-  uninit() {
-    let sessionHistory = this.mm.docShell.QueryInterface(
-      Ci.nsIWebNavigation
-    ).sessionHistory;
-    if (sessionHistory) {
-      sessionHistory.legacySHistory.removeSHistoryListener(this); // OK in non-geckoview
-    }
-  }
-
-  collect() {
-    // We want to send down a historychange even for full collects in case our
-    // session history is a partial session history, in which case we don't have
-    // enough information for a full update. collectFrom(-1) tells the collect
-    // function to collect all data avaliable in this process.
-    if (this.mm.docShell) {
-      this.collectFrom(-1);
-    }
-  }
-
-  // History can grow relatively big with the nested elements, so if we don't have to, we
-  // don't want to send the entire history all the time. For a simple optimization
-  // we keep track of the smallest index from after any change has occured and we just send
-  // the elements from that index. If something more complicated happens we just clear it
-  // and send the entire history. We always send the additional info like the current selected
-  // index (so for going back and forth between history entries we set the index to kLastIndex
-  // if nothing else changed send an empty array and the additonal info like the selected index)
-  collectFrom(idx) {
-    if (this._fromIdx <= idx) {
-      // If we already know that we need to update history fromn index N we can ignore any changes
-      // tha happened with an element with index larger than N.
-      // Note: initially we use kNoIndex which is MAX_SAFE_INTEGER which means we don't ignore anything
-      // here, and in case of navigation in the history back and forth we use kLastIndex which ignores
-      // only the subsequent navigations, but not any new elements added.
-      return;
-    }
-
-    this._fromIdx = idx;
-    this.store.messageQueue.push("historychange", () => {
-      if (this._fromIdx === kNoIndex) {
-        return null;
-      }
-
-      let history = lazy.SessionHistory.collect(
-        this.mm.docShell,
-        this._fromIdx
-      );
-      this._fromIdx = kNoIndex;
-      return history;
-    });
-  }
-
-  handleEvent(event) {
-    this.collect();
-  }
-
-  OnHistoryNewEntry(newURI, oldIndex) {
-    // Collect the current entry as well, to make sure to collect any changes
-    // that were made to the entry while the document was active.
-    this.collectFrom(oldIndex == -1 ? oldIndex : oldIndex - 1);
-  }
-
-  OnHistoryGotoIndex() {
-    // We ought to collect the previously current entry as well, see bug 1350567.
-    this.collectFrom(kLastIndex);
-  }
-
-  OnHistoryPurge() {
-    this.collect();
-  }
-
-  OnHistoryReload() {
-    this.collect();
-    return true;
-  }
-
-  OnHistoryReplaceEntry() {
-    this.collect();
-  }
-
-  /**
-   * @see nsIWebProgressListener.onStateChange
-   */
-  onStateChange(webProgress, request, stateFlags, status) {
-    // Ignore state changes for subframes because we're only interested in the
-    // top-document starting or stopping its load.
-    if (!webProgress.isTopLevel || webProgress.DOMWindow != this.mm.content) {
-      return;
-    }
-
-    // onStateChange will be fired when loading the initial about:blank URI for
-    // a browser, which we don't actually care about. This is particularly for
-    // the case of unrestored background tabs, where the content has not yet
-    // been restored: we don't want to accidentally send any updates to the
-    // parent when the about:blank placeholder page has loaded.
-    if (!this.mm.docShell.hasLoadedNonBlankURI) {
-      return;
-    }
-
-    if (stateFlags & Ci.nsIWebProgressListener.STATE_START) {
-      this.collect();
-    } else if (stateFlags & Ci.nsIWebProgressListener.STATE_STOP) {
-      this.collect();
-    }
-  }
-}
-SessionHistoryListener.prototype.QueryInterface = ChromeUtils.generateQI([
-  "nsIWebProgressListener",
-  "nsISHistoryListener",
-  "nsISupportsWeakReference",
-]);
-
-/**
- * A message queue that takes collected data and will take care of sending it
- * to the chrome process. It allows flushing using synchronous messages and
- * takes care of any race conditions that might occur because of that. Changes
- * will be batched if they're pushed in quick succession to avoid a message
- * flood.
- */
-class MessageQueue extends Handler {
-  constructor(store) {
-    super(store);
-
-    /**
-     * A map (string -> lazy fn) holding lazy closures of all queued data
-     * collection routines. These functions will return data collected from the
-     * docShell.
-     */
-    this._data = new Map();
-
-    /**
-     * The delay (in ms) used to delay sending changes after data has been
-     * invalidated.
-     */
-    this.BATCH_DELAY_MS = 1000;
-
-    /**
-     * The minimum idle period (in ms) we need for sending data to chrome process.
-     */
-    this.NEEDED_IDLE_PERIOD_MS = 5;
-
-    /**
-     * Timeout for waiting an idle period to send data. We will set this from
-     * the pref "browser.sessionstore.interval".
-     */
-    this._timeoutWaitIdlePeriodMs = null;
-
-    /**
-     * The current timeout ID, null if there is no queue data. We use timeouts
-     * to damp a flood of data changes and send lots of changes as one batch.
-     */
-    this._timeout = null;
-
-    /**
-     * Whether or not sending batched messages on a timer is disabled. This should
-     * only be used for debugging or testing. If you need to access this value,
-     * you should probably use the timeoutDisabled getter.
-     */
-    this._timeoutDisabled = false;
-
-    /**
-     * True if there is already a send pending idle dispatch, set to prevent
-     * scheduling more than one. If false there may or may not be one scheduled.
-     */
-    this._idleScheduled = false;
-
-    this.timeoutDisabled = Services.prefs.getBoolPref(TIMEOUT_DISABLED_PREF);
-    this._timeoutWaitIdlePeriodMs = Services.prefs.getIntPref(PREF_INTERVAL);
-
-    Services.prefs.addObserver(TIMEOUT_DISABLED_PREF, this);
-    Services.prefs.addObserver(PREF_INTERVAL, this);
-  }
-
-  /**
-   * True if batched messages are not being fired on a timer. This should only
-   * ever be true when debugging or during tests.
-   */
-  get timeoutDisabled() {
-    return this._timeoutDisabled;
-  }
-
-  /**
-   * Disables sending batched messages on a timer. Also cancels any pending
-   * timers.
-   */
-  set timeoutDisabled(val) {
-    this._timeoutDisabled = val;
-
-    if (val && this._timeout) {
-      clearTimeout(this._timeout);
-      this._timeout = null;
-    }
-  }
-
-  uninit() {
-    Services.prefs.removeObserver(TIMEOUT_DISABLED_PREF, this);
-    Services.prefs.removeObserver(PREF_INTERVAL, this);
-    this.cleanupTimers();
-  }
-
-  /**
-   * Cleanup pending idle callback and timer.
-   */
-  cleanupTimers() {
-    this._idleScheduled = false;
-    if (this._timeout) {
-      clearTimeout(this._timeout);
-      this._timeout = null;
-    }
-  }
-
-  observe(subject, topic, data) {
-    if (topic == "nsPref:changed") {
-      switch (data) {
-        case TIMEOUT_DISABLED_PREF:
-          this.timeoutDisabled = Services.prefs.getBoolPref(
-            TIMEOUT_DISABLED_PREF
-          );
-          break;
-        case PREF_INTERVAL:
-          this._timeoutWaitIdlePeriodMs =
-            Services.prefs.getIntPref(PREF_INTERVAL);
-          break;
-        default:
-          console.error("received unknown message '" + data + "'");
-          break;
-      }
-    }
-  }
-
-  /**
-   * Pushes a given |value| onto the queue. The given |key| represents the type
-   * of data that is stored and can override data that has been queued before
-   * but has not been sent to the parent process, yet.
-   *
-   * @param key (string)
-   *        A unique identifier specific to the type of data this is passed.
-   * @param fn (function)
-   *        A function that returns the value that will be sent to the parent
-   *        process.
-   */
-  push(key, fn) {
-    this._data.set(key, fn);
-
-    if (!this._timeout && !this._timeoutDisabled) {
-      // Wait a little before sending the message to batch multiple changes.
-      this._timeout = setTimeoutWithTarget(
-        () => this.sendWhenIdle(),
-        this.BATCH_DELAY_MS,
-        this.mm.tabEventTarget
-      );
-    }
-  }
-
-  /**
-   * Sends queued data when the remaining idle time is enough or waiting too
-   * long; otherwise, request an idle time again. If the |deadline| is not
-   * given, this function is going to schedule the first request.
-   *
-   * @param deadline (object)
-   *        An IdleDeadline object passed by idleDispatch().
-   */
-  sendWhenIdle(deadline) {
-    if (!this.mm.content) {
-      // The frameloader is being torn down. Nothing more to do.
-      return;
-    }
-
-    if (deadline) {
-      if (
-        deadline.didTimeout ||
-        deadline.timeRemaining() > this.NEEDED_IDLE_PERIOD_MS
-      ) {
-        this.send();
-        return;
-      }
-    } else if (this._idleScheduled) {
-      // Bail out if there's a pending run.
-      return;
-    }
-    ChromeUtils.idleDispatch(deadline_ => this.sendWhenIdle(deadline_), {
-      timeout: this._timeoutWaitIdlePeriodMs,
-    });
-    this._idleScheduled = true;
-  }
-
-  /**
-   * Sends queued data to the chrome process.
-   *
-   * @param options (object)
-   *        {flushID: 123} to specify that this is a flush
-   *        {isFinal: true} to signal this is the final message sent on unload
-   */
-  send(options = {}) {
-    // Looks like we have been called off a timeout after the tab has been
-    // closed. The docShell is gone now and we can just return here as there
-    // is nothing to do.
-    if (!this.mm.docShell) {
-      return;
-    }
-
-    this.cleanupTimers();
-
-    let flushID = (options && options.flushID) || 0;
-    let histID = "FX_SESSION_RESTORE_CONTENT_COLLECT_DATA_MS";
-
-    let data = {};
-    for (let [key, func] of this._data) {
-      if (key != "isPrivate") {
-        TelemetryStopwatch.startKeyed(histID, key);
-      }
-
-      let value = func();
-
-      if (key != "isPrivate") {
-        TelemetryStopwatch.finishKeyed(histID, key);
-      }
-
-      if (value || (key != "storagechange" && key != "historychange")) {
-        data[key] = value;
-      }
-    }
-
-    this._data.clear();
-
-    try {
-      // Send all data to the parent process.
-      this.mm.sendAsyncMessage("SessionStore:update", {
-        data,
-        flushID,
-        isFinal: options.isFinal || false,
-        epoch: this.store.epoch,
-      });
-    } catch (ex) {
-      if (ex && ex.result == Cr.NS_ERROR_OUT_OF_MEMORY) {
-        Services.telemetry
-          .getHistogramById("FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM")
-          .add(1);
-        this.mm.sendAsyncMessage("SessionStore:error");
-      }
-    }
-  }
-}
-
-/**
- * Listens for and handles messages sent by the session store service.
- */
-const MESSAGES = [
-  "SessionStore:restoreHistory",
-  "SessionStore:restoreTabContent",
-  "SessionStore:resetRestore",
-  "SessionStore:flush",
-  "SessionStore:prepareForProcessChange",
-];
-
-export class ContentSessionStore {
-  constructor(mm) {
-    if (Services.appinfo.sessionHistoryInParent) {
-      throw new Error("This frame script should not be loaded for SHIP");
-    }
-
-    this.mm = mm;
-    this.messageQueue = new MessageQueue(this);
-
-    this.epoch = 0;
-
-    this.contentRestoreInitialized = false;
-
-    this.handlers = [
-      this.messageQueue,
-      new EventListener(this),
-      new SessionHistoryListener(this),
-    ];
-
-    XPCOMUtils.defineLazyGetter(this, "contentRestore", () => {
-      this.contentRestoreInitialized = true;
-      return new lazy.ContentRestore(mm);
-    });
-
-    MESSAGES.forEach(m => mm.addMessageListener(m, this));
-
-    mm.addEventListener("unload", this);
-  }
-
-  receiveMessage({ name, data }) {
-    // The docShell might be gone. Don't process messages,
-    // that will just lead to errors anyway.
-    if (!this.mm.docShell) {
-      return;
-    }
-
-    // A fresh tab always starts with epoch=0. The parent has the ability to
-    // override that to signal a new era in this tab's life. This enables it
-    // to ignore async messages that were already sent but not yet received
-    // and would otherwise confuse the internal tab state.
-    if (data && data.epoch && data.epoch != this.epoch) {
-      this.epoch = data.epoch;
-    }
-
-    switch (name) {
-      case "SessionStore:restoreHistory":
-        this.restoreHistory(data);
-        break;
-      case "SessionStore:restoreTabContent":
-        this.restoreTabContent(data);
-        break;
-      case "SessionStore:resetRestore":
-        this.contentRestore.resetRestore();
-        break;
-      case "SessionStore:flush":
-        this.flush(data);
-        break;
-      case "SessionStore:prepareForProcessChange":
-        // During normal in-process navigations, the DocShell would take
-        // care of automatically persisting layout history state to record
-        // scroll positions on the nsSHEntry. Unfortunately, process switching
-        // is not a normal navigation, so for now we do this ourselves. This
-        // is a workaround until session history state finally lives in the
-        // parent process.
-        this.mm.docShell.persistLayoutHistoryState();
-        break;
-      default:
-        console.error("received unknown message '" + name + "'");
-        break;
-    }
-  }
-
-  // non-SHIP only
-  restoreHistory(data) {
-    let { epoch, tabData, loadArguments, isRemotenessUpdate } = data;
-
-    this.contentRestore.restoreHistory(tabData, loadArguments, {
-      // Note: The callbacks passed here will only be used when a load starts
-      // that was not initiated by sessionstore itself. This can happen when
-      // some code calls browser.loadURI() or browser.reload() on a pending
-      // browser/tab.
-
-      onLoadStarted: () => {
-        // Notify the parent that the tab is no longer pending.
-        this.mm.sendAsyncMessage("SessionStore:restoreTabContentStarted", {
-          epoch,
-        });
-      },
-
-      onLoadFinished: () => {
-        // Tell SessionStore.sys.mjs that it may want to restore some more tabs,
-        // since it restores a max of MAX_CONCURRENT_TAB_RESTORES at a time.
-        this.mm.sendAsyncMessage("SessionStore:restoreTabContentComplete", {
-          epoch,
-        });
-      },
-    });
-
-    if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_DEFAULT) {
-      // For non-remote tabs, when restoreHistory finishes, we send a synchronous
-      // message to SessionStore.sys.mjs so that it can run SSTabRestoring. Users of
-      // SSTabRestoring seem to get confused if chrome and content are out of
-      // sync about the state of the restore (particularly regarding
-      // docShell.currentURI). Using a synchronous message is the easiest way
-      // to temporarily synchronize them.
-      //
-      // For remote tabs, because all nsIWebProgress notifications are sent
-      // asynchronously using messages, we get the same-order guarantees of the
-      // message manager, and can use an async message.
-      this.mm.sendSyncMessage("SessionStore:restoreHistoryComplete", {
-        epoch,
-        isRemotenessUpdate,
-      });
-    } else {
-      this.mm.sendAsyncMessage("SessionStore:restoreHistoryComplete", {
-        epoch,
-        isRemotenessUpdate,
-      });
-    }
-  }
-
-  restoreTabContent({ loadArguments, isRemotenessUpdate, reason }) {
-    let epoch = this.epoch;
-
-    // We need to pass the value of didStartLoad back to SessionStore.sys.mjs.
-    let didStartLoad = this.contentRestore.restoreTabContent(
-      loadArguments,
-      isRemotenessUpdate,
-      () => {
-        // Tell SessionStore.sys.mjs that it may want to restore some more tabs,
-        // since it restores a max of MAX_CONCURRENT_TAB_RESTORES at a time.
-        this.mm.sendAsyncMessage("SessionStore:restoreTabContentComplete", {
-          epoch,
-          isRemotenessUpdate,
-        });
-      }
-    );
-
-    this.mm.sendAsyncMessage("SessionStore:restoreTabContentStarted", {
-      epoch,
-      isRemotenessUpdate,
-      reason,
-    });
-
-    if (!didStartLoad) {
-      // Pretend that the load succeeded so that event handlers fire correctly.
-      this.mm.sendAsyncMessage("SessionStore:restoreTabContentComplete", {
-        epoch,
-        isRemotenessUpdate,
-      });
-    }
-  }
-
-  flush({ id }) {
-    // Flush the message queue, send the latest updates.
-    this.messageQueue.send({ flushID: id });
-  }
-
-  handleEvent(event) {
-    if (event.type == "unload") {
-      this.onUnload();
-    }
-  }
-
-  onUnload() {
-    // Upon frameLoader destruction, send a final update message to
-    // the parent and flush all data currently held in the child.
-    this.messageQueue.send({ isFinal: true });
-
-    for (let handler of this.handlers) {
-      if (handler.uninit) {
-        handler.uninit();
-      }
-    }
-
-    if (this.contentRestoreInitialized) {
-      // Remove progress listeners.
-      this.contentRestore.resetRestore();
-    }
-
-    // We don't need to take care of any StateChangeNotifier observers as they
-    // will die with the content script. The same goes for the privacy transition
-    // observer that will die with the docShell when the tab is closed.
-  }
-}
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
index 2c50de65f8..6506b21216 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -119,59 +119,6 @@ const WINDOW_OPEN_FEATURES_MAP = {
   statusbar: "status",
 };
 
-// Messages that will be received via the Frame Message Manager.
-const MESSAGES = [
-  // The content script sends us data that has been invalidated and needs to
-  // be saved to disk.
-  "SessionStore:update",
-
-  // The restoreHistory code has run. This is a good time to run SSTabRestoring.
-  "SessionStore:restoreHistoryComplete",
-
-  // The load for the restoring tab has begun. We update the URL bar at this
-  // time; if we did it before, the load would overwrite it.
-  "SessionStore:restoreTabContentStarted",
-
-  // All network loads for a restoring tab are done, so we should
-  // consider restoring another tab in the queue. The document has
-  // been restored, and forms have been filled. We trigger
-  // SSTabRestored at this time.
-  "SessionStore:restoreTabContentComplete",
-
-  // The content script encountered an error.
-  "SessionStore:error",
-];
-
-// The list of messages we accept from <xul:browser>s that have no tab
-// assigned, or whose windows have gone away. Those are for example the
-// ones that preload about:newtab pages, or from browsers where the window
-// has just been closed.
-const NOTAB_MESSAGES = new Set([
-  // For a description see above.
-  "SessionStore:update",
-
-  // For a description see above.
-  "SessionStore:error",
-]);
-
-// The list of messages we accept without an "epoch" parameter.
-// See getCurrentEpoch() and friends to find out what an "epoch" is.
-const NOEPOCH_MESSAGES = new Set([
-  // For a description see above.
-  "SessionStore:error",
-]);
-
-// The list of messages we want to receive even during the short period after a
-// frame has been removed from the DOM and before its frame script has finished
-// unloading.
-const CLOSED_MESSAGES = new Set([
-  // For a description see above.
-  "SessionStore:update",
-
-  // For a description see above.
-  "SessionStore:error",
-]);
-
 // These are tab events that we listen to.
 const TAB_EVENTS = [
   "TabOpen",
@@ -434,10 +381,6 @@ export var SessionStore = {
     SessionStoreInternal.deleteCustomGlobalValue(aKey);
   },
 
-  persistTabAttribute: function ss_persistTabAttribute(aName) {
-    SessionStoreInternal.persistTabAttribute(aName);
-  },
-
   restoreLastSession: function ss_restoreLastSession() {
     SessionStoreInternal.restoreLastSession();
   },
@@ -583,18 +526,6 @@ export var SessionStore = {
       }
     }
   },
-
-  /**
-   * Prepares to change the remoteness of the given browser, by ensuring that
-   * the local instance of session history is up-to-date.
-   */
-  async prepareToChangeRemoteness(aTab) {
-    await SessionStoreInternal.prepareToChangeRemoteness(aTab);
-  },
-
-  finishTabRemotenessChange(aTab, aSwitchId) {
-    SessionStoreInternal.finishTabRemotenessChange(aTab, aSwitchId);
-  },
 };
 
 // Freeze the SessionStore object. We don't want anyone to modify it.
@@ -1047,8 +978,6 @@ var SessionStoreInternal = {
       "privacy.resistFingerprinting"
     );
     Services.prefs.addObserver("privacy.resistFingerprinting", this);
-
-    this._shistoryInParent = Services.appinfo.sessionHistoryInParent;
   },
 
   /**
@@ -1127,33 +1056,26 @@ var SessionStoreInternal = {
         }
         break;
       case "browsing-context-did-set-embedder":
-        if (Services.appinfo.sessionHistoryInParent) {
-          if (
-            aSubject &&
-            aSubject === aSubject.top &&
-            aSubject.isContent &&
-            aSubject.embedderElement &&
-            aSubject.embedderElement.permanentKey
-          ) {
-            let permanentKey = aSubject.embedderElement.permanentKey;
-            this._browserSHistoryListener.get(permanentKey)?.unregister();
-            this.getOrCreateSHistoryListener(permanentKey, aSubject, true);
-          }
+        if (
+          aSubject &&
+          aSubject === aSubject.top &&
+          aSubject.isContent &&
+          aSubject.embedderElement &&
+          aSubject.embedderElement.permanentKey
+        ) {
+          let permanentKey = aSubject.embedderElement.permanentKey;
+          this._browserSHistoryListener.get(permanentKey)?.unregister();
+          this.getOrCreateSHistoryListener(permanentKey, aSubject, true);
         }
         break;
       case "browsing-context-discarded":
-        if (Services.appinfo.sessionHistoryInParent) {
-          let permanentKey = aSubject?.embedderElement?.permanentKey;
-          if (permanentKey) {
-            this._browserSHistoryListener.get(permanentKey)?.unregister();
-          }
+        let permanentKey = aSubject?.embedderElement?.permanentKey;
+        if (permanentKey) {
+          this._browserSHistoryListener.get(permanentKey)?.unregister();
         }
         break;
       case "browser-shutdown-tabstate-updated":
-        if (Services.appinfo.sessionHistoryInParent) {
-          // Non-SHIP code calls this when the frame script is unloaded.
-          this.onFinalTabStateUpdateComplete(aSubject);
-        }
+        this.onFinalTabStateUpdateComplete(aSubject);
         this._notifyOfClosedObjectsChange();
         break;
     }
@@ -1266,10 +1188,6 @@ var SessionStoreInternal = {
       }
     }
 
-    if (!Services.appinfo.sessionHistoryInParent) {
-      throw new Error("This function should only be used with SHIP");
-    }
-
     if (!permanentKey || browsingContext !== browsingContext.top) {
       return null;
     }
@@ -1383,29 +1301,27 @@ var SessionStoreInternal = {
       return;
     }
 
-    if (Services.appinfo.sessionHistoryInParent) {
-      let listener = this.getOrCreateSHistoryListener(
-        permanentKey,
-        browsingContext
-      );
+    let listener = this.getOrCreateSHistoryListener(
+      permanentKey,
+      browsingContext
+    );
 
-      if (listener) {
-        let historychange =
-          // If it is not the scheduled update (tab closed, window closed etc),
-          // try to store the loading non-web-controlled page opened in _blank
-          // first.
-          (forStorage &&
-            lazy.SessionHistory.collectNonWebControlledBlankLoadingSession(
-              browsingContext
-            )) ||
-          listener.collect(permanentKey, browsingContext, {
-            collectFull: !!update.sHistoryNeeded,
-            writeToCache: false,
-          });
+    if (listener) {
+      let historychange =
+        // If it is not the scheduled update (tab closed, window closed etc),
+        // try to store the loading non-web-controlled page opened in _blank
+        // first.
+        (forStorage &&
+          lazy.SessionHistory.collectNonWebControlledBlankLoadingSession(
+            browsingContext
+          )) ||
+        listener.collect(permanentKey, browsingContext, {
+          collectFull: !!update.sHistoryNeeded,
+          writeToCache: false,
+        });
 
-        if (historychange) {
-          update.data.historychange = historychange;
-        }
+      if (historychange) {
+        update.data.historychange = historychange;
       }
     }
 
@@ -1416,98 +1332,6 @@ var SessionStoreInternal = {
     this.onTabStateUpdate(permanentKey, win, update);
   },
 
-  /**
-   * This method handles incoming messages sent by the session store content
-   * script via the Frame Message Manager or Parent Process Message Manager,
-   * and thus enables communication with OOP tabs.
-   */
-  receiveMessage(aMessage) {
-    if (Services.appinfo.sessionHistoryInParent) {
-      throw new Error(
-        `received unexpected message '${aMessage.name}' with ` +
-          `sessionHistoryInParent enabled`
-      );
-    }
-
-    // If we got here, that means we're dealing with a frame message
-    // manager message, so the target will be a <xul:browser>.
-    var browser = aMessage.target;
-    let win = browser.ownerGlobal;
-    let tab = win ? win.gBrowser.getTabForBrowser(browser) : null;
-
-    // Ensure we receive only specific messages from <xul:browser>s that
-    // have no tab or window assigned, e.g. the ones that preload
-    // about:newtab pages, or windows that have closed.
-    if (!tab && !NOTAB_MESSAGES.has(aMessage.name)) {
-      throw new Error(
-        `received unexpected message '${aMessage.name}' ` +
-          `from a browser that has no tab or window`
-      );
-    }
-
-    let data = aMessage.data || {};
-    let hasEpoch = data.hasOwnProperty("epoch");
-
-    // Most messages sent by frame scripts require to pass an epoch.
-    if (!hasEpoch && !NOEPOCH_MESSAGES.has(aMessage.name)) {
-      throw new Error(`received message '${aMessage.name}' without an epoch`);
-    }
-
-    // Ignore messages from previous epochs.
-    if (hasEpoch && !this.isCurrentEpoch(browser.permanentKey, data.epoch)) {
-      return;
-    }
-
-    switch (aMessage.name) {
-      case "SessionStore:update":
-        // |browser.frameLoader| might be empty if the browser was already
-        // destroyed and its tab removed. In that case we still have the last
-        // frameLoader we know about to compare.
-        let frameLoader =
-          browser.frameLoader ||
-          this._lastKnownFrameLoader.get(browser.permanentKey);
-
-        // If the message isn't targeting the latest frameLoader discard it.
-        if (frameLoader != aMessage.targetFrameLoader) {
-          return;
-        }
-
-        this.onTabStateUpdate(browser.permanentKey, browser.ownerGlobal, data);
-
-        // SHIP code will call this when it receives "browser-shutdown-tabstate-updated"
-        if (data.isFinal) {
-          if (!Services.appinfo.sessionHistoryInParent) {
-            this.onFinalTabStateUpdateComplete(browser);
-          }
-        } else if (data.flushID) {
-          // This is an update kicked off by an async flush request. Notify the
-          // TabStateFlusher so that it can finish the request and notify its
-          // consumer that's waiting for the flush to be done.
-          lazy.TabStateFlusher.resolve(browser, data.flushID);
-        }
-
-        break;
-      case "SessionStore:restoreHistoryComplete":
-        this._restoreHistoryComplete(browser, data);
-        break;
-      case "SessionStore:restoreTabContentStarted":
-        this._restoreTabContentStarted(browser, data);
-        break;
-      case "SessionStore:restoreTabContentComplete":
-        this._restoreTabContentComplete(browser, data);
-        break;
-      case "SessionStore:error":
-        lazy.TabStateFlusher.resolveAll(
-          browser,
-          false,
-          "Received error from the content process"
-        );
-        break;
-      default:
-        throw new Error(`received unknown message '${aMessage.name}'`);
-    }
-  },
-
   /* ........ Window Event Handlers .............. */
 
   /**
@@ -1607,21 +1431,6 @@ var SessionStoreInternal = {
     // internal data about the window.
     aWindow.__SSi = this._generateWindowID();
 
-    if (!Services.appinfo.sessionHistoryInParent) {
-      let mm = aWindow.getGroupMessageManager("browsers");
-      MESSAGES.forEach(msg => {
-        let listenWhenClosed = CLOSED_MESSAGES.has(msg);
-        mm.addMessageListener(msg, this, listenWhenClosed);
-      });
-
-      // Load the frame script after registering listeners.
-      mm.loadFrameScript(
-        "chrome://browser/content/content-sessionStore.js",
-        true,
-        true
-      );
-    }
-
     // and create its data object
     this._windows[aWindow.__SSi] = {
       tabs: [],
@@ -2090,11 +1899,6 @@ var SessionStoreInternal = {
     // Cache the window state until it is completely gone.
     DyingWindowCache.set(aWindow, winData);
 
-    if (!Services.appinfo.sessionHistoryInParent) {
-      let mm = aWindow.getGroupMessageManager("browsers");
-      MESSAGES.forEach(msg => mm.removeMessageListener(msg, this));
-    }
-
     this._saveableClosedWindowData.delete(winData);
     delete aWindow.__SSi;
   },
@@ -3615,12 +3419,6 @@ var SessionStoreInternal = {
     this.saveStateDelayed();
   },
 
-  persistTabAttribute: function ssi_persistTabAttribute(aName) {
-    if (lazy.TabAttributes.persist(aName)) {
-      this.saveStateDelayed();
-    }
-  },
-
   /**
    * Undoes the closing of a tab or window which corresponds
    * to the closedId passed in.
@@ -4782,13 +4580,6 @@ var SessionStoreInternal = {
       tab.updateLastAccessed(tabData.lastAccessed);
     }
 
-    if ("attributes" in tabData) {
-      // Ensure that we persist tab attributes restored from previous sessions.
-      Object.keys(tabData.attributes).forEach(a =>
-        lazy.TabAttributes.persist(a)
-      );
-    }
-
     if (!tabData.entries) {
       tabData.entries = [];
     }
@@ -4958,7 +4749,6 @@ var SessionStoreInternal = {
 
     let browser = aTab.linkedBrowser;
     let window = aTab.ownerGlobal;
-    let tabbrowser = window.gBrowser;
     let tabData = lazy.TabState.clone(aTab, TAB_CUSTOM_VALUES.get(aTab));
     let activeIndex = tabData.index - 1;
     let activePageData = tabData.entries[activeIndex] || null;
@@ -4966,36 +4756,9 @@ var SessionStoreInternal = {
 
     this.markTabAsRestoring(aTab);
 
-    let isRemotenessUpdate = aOptions.isRemotenessUpdate;
-    let explicitlyUpdateRemoteness = !Services.appinfo.sessionHistoryInParent;
-    // If we aren't already updating the browser's remoteness, check if it's
-    // necessary.
-    if (explicitlyUpdateRemoteness && !isRemotenessUpdate) {
-      isRemotenessUpdate = tabbrowser.updateBrowserRemotenessByURL(
-        browser,
-        uri
-      );
-
-      if (isRemotenessUpdate) {
-        // We updated the remoteness, so we need to send the history down again.
-        //
-        // Start a new epoch to discard all frame script messages relating to a
-        // previous epoch. All async messages that are still on their way to chrome
-        // will be ignored and don't override any tab data set when restoring.
-        let epoch = this.startNextEpoch(browser.permanentKey);
-
-        this._sendRestoreHistory(browser, {
-          tabData,
-          epoch,
-          loadArguments,
-          isRemotenessUpdate,
-        });
-      }
-    }
-
     this._sendRestoreTabContent(browser, {
       loadArguments,
-      isRemotenessUpdate,
+      isRemotenessUpdate: aOptions.isRemotenessUpdate,
       reason:
         aOptions.restoreContentReason || RESTORE_TAB_CONTENT_REASON.SET_STATE,
     });
@@ -6049,10 +5812,8 @@ var SessionStoreInternal = {
     // The browser is no longer in any sort of restoring state.
     TAB_STATE_FOR_BROWSER.delete(browser);
 
-    if (Services.appinfo.sessionHistoryInParent) {
-      this._restoreListeners.get(browser.permanentKey)?.unregister();
-      browser.browsingContext.clearRestoreState();
-    }
+    this._restoreListeners.get(browser.permanentKey)?.unregister();
+    browser.browsingContext.clearRestoreState();
 
     aTab.removeAttribute("pending");
 
@@ -6076,9 +5837,6 @@ var SessionStoreInternal = {
       return;
     }
 
-    if (!Services.appinfo.sessionHistoryInParent) {
-      browser.messageManager.sendAsyncMessage("SessionStore:resetRestore", {});
-    }
     this._resetLocalTabRestoringState(tab);
   },
 
@@ -6357,10 +6115,6 @@ var SessionStoreInternal = {
    * history restores.
    */
   _restoreHistory(browser, data) {
-    if (!Services.appinfo.sessionHistoryInParent) {
-      throw new Error("This function should only be used with SHIP");
-    }
-
     this._tabStateToRestore.set(browser.permanentKey, data);
 
     // In case about:blank isn't done yet.
@@ -6452,10 +6206,6 @@ var SessionStoreInternal = {
    * history restores.
    */
   _restoreTabContent(browser, options = {}) {
-    if (!Services.appinfo.sessionHistoryInParent) {
-      throw new Error("This function should only be used with SHIP");
-    }
-
     this._restoreListeners.get(browser.permanentKey)?.unregister();
 
     this._restoreTabContentStarted(browser, options);
@@ -6480,14 +6230,7 @@ var SessionStoreInternal = {
   },
 
   _sendRestoreTabContent(browser, options) {
-    if (Services.appinfo.sessionHistoryInParent) {
-      this._restoreTabContent(browser, options);
-    } else {
-      browser.messageManager.sendAsyncMessage(
-        "SessionStore:restoreTabContent",
-        options
-      );
-    }
+    this._restoreTabContent(browser, options);
   },
 
   _restoreHistoryComplete(browser, data) {
@@ -6631,68 +6374,12 @@ var SessionStoreInternal = {
       delete options.tabData.storage;
     }
 
-    if (Services.appinfo.sessionHistoryInParent) {
-      this._restoreHistory(browser, options);
-    } else {
-      browser.messageManager.sendAsyncMessage(
-        "SessionStore:restoreHistory",
-        options
-      );
-    }
+    this._restoreHistory(browser, options);
 
     if (browser && browser.frameLoader) {
       browser.frameLoader.requestEpochUpdate(options.epoch);
     }
   },
-
-  // Flush out session history state so that it can be used to restore the state
-  // into a new process in `finishTabRemotenessChange`.
-  //
-  // NOTE: This codepath is temporary while the Fission Session History rewrite
-  // is in process, and will be removed & replaced once that rewrite is
-  // complete. (bug 1645062)
-  async prepareToChangeRemoteness(aBrowser) {
-    aBrowser.messageManager.sendAsyncMessage(
-      "SessionStore:prepareForProcessChange"
-    );
-    await lazy.TabStateFlusher.flush(aBrowser);
-  },
-
-  // Handle finishing the remoteness change for a tab by restoring session
-  // history state into it, and resuming the ongoing network load.
-  //
-  // NOTE: This codepath is temporary while the Fission Session History rewrite
-  // is in process, and will be removed & replaced once that rewrite is
-  // complete. (bug 1645062)
-  finishTabRemotenessChange(aTab, aSwitchId) {
-    let window = aTab.ownerGlobal;
-    if (!window || !window.__SSi || window.closed) {
-      return;
-    }
-
-    let tabState = lazy.TabState.clone(aTab, TAB_CUSTOM_VALUES.get(aTab));
-    let options = {
-      restoreImmediately: true,
-      restoreContentReason: RESTORE_TAB_CONTENT_REASON.NAVIGATE_AND_RESTORE,
-      isRemotenessUpdate: true,
-      loadArguments: {
-        redirectLoadSwitchId: aSwitchId,
-        // As we're resuming a load which has been redirected from another
-        // process, record the history index which is currently being requested.
-        // It has to be offset by 1 to get back to native history indices from
-        // SessionStore history indicies.
-        redirectHistoryIndex: tabState.requestedIndex - 1,
-      },
-    };
-
-    // Need to reset restoring tabs.
-    if (TAB_STATE_FOR_BROWSER.has(aTab.linkedBrowser)) {
-      this._resetLocalTabRestoringState(aTab);
-    }
-
-    // Restore the state into the tab.
-    this.restoreTab(aTab, tabState, options);
-  },
 };
 
 /**
diff --git a/browser/components/sessionstore/TabAttributes.sys.mjs b/browser/components/sessionstore/TabAttributes.sys.mjs
index 1c7f54b6ab..ea53156d12 100644
--- a/browser/components/sessionstore/TabAttributes.sys.mjs
+++ b/browser/components/sessionstore/TabAttributes.sys.mjs
@@ -2,27 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-// We never want to directly read or write these attributes.
-// 'image' should not be accessed directly but handled by using the
-//         gBrowser.getIcon()/setIcon() methods.
-// 'muted' should not be accessed directly but handled by using the
-//         tab.linkedBrowser.audioMuted/toggleMuteAudio methods.
-// 'pending' is used internal by sessionstore and managed accordingly.
-const ATTRIBUTES_TO_SKIP = new Set([
-  "image",
-  "muted",
-  "pending",
-  "skipbackgroundnotify",
-]);
+// Tab attributes which are persisted & restored by SessionStore.
+const PERSISTED_ATTRIBUTES = ["customizemode"];
 
 // A set of tab attributes to persist. We will read a given list of tab
 // attributes when collecting tab data and will re-set those attributes when
 // the given tab data is restored to a new tab.
 export var TabAttributes = Object.freeze({
-  persist(name) {
-    return TabAttributesInternal.persist(name);
-  },
-
   get(tab) {
     return TabAttributesInternal.get(tab);
   },
@@ -33,21 +19,10 @@ export var TabAttributes = Object.freeze({
 });
 
 var TabAttributesInternal = {
-  _attrs: new Set(),
-
-  persist(name) {
-    if (this._attrs.has(name) || ATTRIBUTES_TO_SKIP.has(name)) {
-      return false;
-    }
-
-    this._attrs.add(name);
-    return true;
-  },
-
   get(tab) {
     let data = {};
 
-    for (let name of this._attrs) {
+    for (let name of PERSISTED_ATTRIBUTES) {
       if (tab.hasAttribute(name)) {
         data[name] = tab.getAttribute(name);
       }
@@ -57,15 +32,11 @@ var TabAttributesInternal = {
   },
 
   set(tab, data = {}) {
-    // Clear attributes.
-    for (let name of this._attrs) {
+    // Clear & Set attributes.
+    for (let name of PERSISTED_ATTRIBUTES) {
       tab.removeAttribute(name);
-    }
-
-    // Set attributes.
-    for (let [name, value] of Object.entries(data)) {
-      if (!ATTRIBUTES_TO_SKIP.has(name)) {
-        tab.setAttribute(name, value);
+      if (name in data) {
+        tab.setAttribute(name, data[name]);
       }
     }
   },
diff --git a/browser/components/sessionstore/TabStateFlusher.sys.mjs b/browser/components/sessionstore/TabStateFlusher.sys.mjs
index e391abc970..ed7953e41e 100644
--- a/browser/components/sessionstore/TabStateFlusher.sys.mjs
+++ b/browser/components/sessionstore/TabStateFlusher.sys.mjs
@@ -2,11 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
-});
-
 /**
  * A module that enables async flushes. Updates from frame scripts are
  * throttled to be sent only once per second. If an action wants a tab's latest
@@ -33,23 +28,6 @@ export var TabStateFlusher = Object.freeze({
   },
 
   /**
-   * Resolves the flush request with the given flush ID.
-   *
-   * @param browser (<xul:browser>)
-   *        The browser for which the flush is being resolved.
-   * @param flushID (int)
-   *        The ID of the flush that was sent to the browser.
-   * @param success (bool, optional)
-   *        Whether or not the flush succeeded.
-   * @param message (string, optional)
-   *        An error message that will be sent to the Console in the
-   *        event that a flush failed.
-   */
-  resolve(browser, flushID, success = true, message = "") {
-    TabStateFlusherInternal.resolve(browser, flushID, success, message);
-  },
-
-  /**
    * Resolves all active flush requests for a given browser. This should be
    * used when the content process crashed or the final update message was
    * seen. In those cases we can't guarantee to ever hear back from the frame
@@ -69,9 +47,6 @@ export var TabStateFlusher = Object.freeze({
 });
 
 var TabStateFlusherInternal = {
-  // Stores the last request ID.
-  _lastRequestID: 0,
-
   // A map storing all active requests per browser. A request is a
   // triple of a map containing all flush requests, a promise that
   // resolve when a request for a browser is canceled, and the
@@ -79,7 +54,6 @@ var TabStateFlusherInternal = {
   _requests: new WeakMap(),
 
   initEntry(entry) {
-    entry.perBrowserRequests = new Map();
     entry.cancelPromise = new Promise(resolve => {
       entry.cancel = resolve;
     }).then(result => {
@@ -96,7 +70,6 @@ var TabStateFlusherInternal = {
    * all the latest data.
    */
   flush(browser) {
-    let id = ++this._lastRequestID;
     let nativePromise = Promise.resolve();
     if (browser && browser.frameLoader) {
       /*
@@ -106,24 +79,6 @@ var TabStateFlusherInternal = {
       nativePromise = browser.frameLoader.requestTabStateFlush();
     }
 
-    if (!Services.appinfo.sessionHistoryInParent) {
-      /*
-        In the event that we have to trigger a process switch and thus change
-        browser remoteness, session store needs to register and track the new
-        browser window loaded and to have message manager listener registered
-        ** before ** TabStateFlusher send "SessionStore:flush" message. This fixes
-        the race where we send the message before the message listener is
-        registered for it.
-        */
-      lazy.SessionStore.ensureInitialized(browser.ownerGlobal);
-
-      let mm = browser.messageManager;
-      mm.sendAsyncMessage("SessionStore:flush", {
-        id,
-        epoch: lazy.SessionStore.getCurrentEpoch(browser),
-      });
-    }
-
     // Retrieve active requests for given browser.
     let permanentKey = browser.permanentKey;
     let request = this._requests.get(permanentKey);
@@ -134,22 +89,10 @@ var TabStateFlusherInternal = {
       this._requests.set(permanentKey, request);
     }
 
-    // Non-SHIP flushes resolve this after the "SessionStore:update" message. We
-    // don't use that message for SHIP, so it's fine to resolve the request
-    // immediately after the native promise resolves, since SessionStore will
-    // have processed all updates from this browser by that point.
-    let requestPromise = Promise.resolve();
-    if (!Services.appinfo.sessionHistoryInParent) {
-      requestPromise = new Promise(resolve => {
-        // Store resolve() so that we can resolve the promise later.
-        request.perBrowserRequests.set(id, resolve);
-      });
-    }
-
-    return Promise.race([
-      nativePromise.then(_ => requestPromise),
-      request.cancelPromise,
-    ]);
+    // It's fine to resolve the request immediately after the native promise
+    // resolves, since SessionStore will have processed all updates from this
+    // browser by that point.
+    return Promise.race([nativePromise, request.cancelPromise]);
   },
 
   /**
@@ -167,41 +110,6 @@ var TabStateFlusherInternal = {
   },
 
   /**
-   * Resolves the flush request with the given flush ID.
-   *
-   * @param browser (<xul:browser>)
-   *        The browser for which the flush is being resolved.
-   * @param flushID (int)
-   *        The ID of the flush that was sent to the browser.
-   * @param success (bool, optional)
-   *        Whether or not the flush succeeded.
-   * @param message (string, optional)
-   *        An error message that will be sent to the Console in the
-   *        event that a flush failed.
-   */
-  resolve(browser, flushID, success = true, message = "") {
-    // Nothing to do if there are no pending flushes for the given browser.
-    if (!this._requests.has(browser.permanentKey)) {
-      return;
-    }
-
-    // Retrieve active requests for given browser.
-    let { perBrowserRequests } = this._requests.get(browser.permanentKey);
-    if (!perBrowserRequests.has(flushID)) {
-      return;
-    }
-
-    if (!success) {
-      console.error("Failed to flush browser: ", message);
-    }
-
-    // Resolve the request with the given id.
-    let resolve = perBrowserRequests.get(flushID);
-    perBrowserRequests.delete(flushID);
-    resolve(success);
-  },
-
-  /**
    * Resolves all active flush requests for a given browser. This should be
    * used when the content process crashed or the final update message was
    * seen. In those cases we can't guarantee to ever hear back from the frame
diff --git a/browser/components/sessionstore/content/content-sessionStore.js b/browser/components/sessionstore/content/content-sessionStore.js
deleted file mode 100644
index a4bdea0bdc..0000000000
--- a/browser/components/sessionstore/content/content-sessionStore.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* eslint-env mozilla/frame-script */
-
-"use strict";
-
-const { ContentSessionStore } = ChromeUtils.importESModule(
-  "resource:///modules/sessionstore/ContentSessionStore.sys.mjs"
-);
-
-void new ContentSessionStore(this);
diff --git a/browser/components/sessionstore/jar.mn b/browser/components/sessionstore/jar.mn
index 7e5bc07dc6..b31a4fb351 100644
--- a/browser/components/sessionstore/jar.mn
+++ b/browser/components/sessionstore/jar.mn
@@ -5,4 +5,3 @@
 browser.jar:
 *   content/browser/aboutSessionRestore.xhtml             (content/aboutSessionRestore.xhtml)
     content/browser/aboutSessionRestore.js                (content/aboutSessionRestore.js)
-    content/browser/content-sessionStore.js               (content/content-sessionStore.js)
diff --git a/browser/components/sessionstore/moz.build b/browser/components/sessionstore/moz.build
index d2191375a9..331b1c65f5 100644
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@@ -10,8 +10,6 @@ BROWSER_CHROME_MANIFESTS += ["test/browser.ini"]
 JAR_MANIFESTS += ["jar.mn"]
 
 EXTRA_JS_MODULES.sessionstore = [
-    "ContentRestore.sys.mjs",
-    "ContentSessionStore.sys.mjs",
     "GlobalState.sys.mjs",
     "RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs",
     "RunState.sys.mjs",
diff --git a/browser/components/sessionstore/test/browser.ini b/browser/components/sessionstore/test/browser.ini
index 85e0c40448..a282c6f268 100644
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -218,7 +218,6 @@ support-files = file_async_duplicate_tab.html
 support-files = file_async_flushes.html
 run-if = crashreporter
 [browser_async_remove_tab.js]
-skip-if = !sessionHistoryInParent
 [browser_async_window_flushing.js]
 https_first_disabled = true
 skip-if =
@@ -319,7 +318,6 @@ skip-if =
   ccov # Bug 1625525
 [browser_privatetabs.js]
 [browser_purge_shistory.js]
-skip-if = !sessionHistoryInParent # Bug 1271024
 [browser_remoteness_flip_on_restore.js]
 [browser_reopen_all_windows.js]
 https_first_disabled = true
@@ -348,8 +346,6 @@ skip-if =
   !fission
   os == "linux" # Bug 1716445
 [browser_scrollPositionsReaderMode.js]
-[browser_send_async_message_oom.js]
-skip-if = sessionHistoryInParent # Tests that the frame script OOMs, which is unused when SHIP is enabled.
 [browser_sessionHistory.js]
 https_first_disabled = true
 support-files =
diff --git a/browser/components/sessionstore/test/browser_687710_2.js b/browser/components/sessionstore/test/browser_687710_2.js
index 81d3c55379..190b5a718a 100644
--- a/browser/components/sessionstore/test/browser_687710_2.js
+++ b/browser/components/sessionstore/test/browser_687710_2.js
@@ -38,61 +38,31 @@ var state = {
 add_task(async function test() {
   let tab = BrowserTestUtils.addTab(gBrowser, "about:blank");
   await promiseTabState(tab, state);
-  if (!SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(tab.linkedBrowser, [], function () {
-      function compareEntries(i, j, history) {
-        let e1 = history.getEntryAtIndex(i);
-        let e2 = history.getEntryAtIndex(j);
 
-        ok(e1.sharesDocumentWith(e2), `${i} should share doc with ${j}`);
-        is(e1.childCount, e2.childCount, `Child count mismatch (${i}, ${j})`);
+  function compareEntries(i, j, history) {
+    let e1 = history.getEntryAtIndex(i);
+    let e2 = history.getEntryAtIndex(j);
 
-        for (let c = 0; c < e1.childCount; c++) {
-          let c1 = e1.GetChildAt(c);
-          let c2 = e2.GetChildAt(c);
+    ok(e1.sharesDocumentWith(e2), `${i} should share doc with ${j}`);
+    is(e1.childCount, e2.childCount, `Child count mismatch (${i}, ${j})`);
 
-          ok(
-            c1.sharesDocumentWith(c2),
-            `Cousins should share documents. (${i}, ${j}, ${c})`
-          );
-        }
-      }
+    for (let c = 0; c < e1.childCount; c++) {
+      let c1 = e1.GetChildAt(c);
+      let c2 = e2.GetChildAt(c);
 
-      let history = docShell.browsingContext.childSessionHistory.legacySHistory;
-
-      is(history.count, 2, "history.count");
-      for (let i = 0; i < history.count; i++) {
-        for (let j = 0; j < history.count; j++) {
-          compareEntries(i, j, history);
-        }
-      }
-    });
-  } else {
-    function compareEntries(i, j, history) {
-      let e1 = history.getEntryAtIndex(i);
-      let e2 = history.getEntryAtIndex(j);
-
-      ok(e1.sharesDocumentWith(e2), `${i} should share doc with ${j}`);
-      is(e1.childCount, e2.childCount, `Child count mismatch (${i}, ${j})`);
-
-      for (let c = 0; c < e1.childCount; c++) {
-        let c1 = e1.GetChildAt(c);
-        let c2 = e2.GetChildAt(c);
-
-        ok(
-          c1.sharesDocumentWith(c2),
-          `Cousins should share documents. (${i}, ${j}, ${c})`
-        );
-      }
+      ok(
+        c1.sharesDocumentWith(c2),
+        `Cousins should share documents. (${i}, ${j}, ${c})`
+      );
     }
+  }
 
-    let history = tab.linkedBrowser.browsingContext.sessionHistory;
+  let history = tab.linkedBrowser.browsingContext.sessionHistory;
 
-    is(history.count, 2, "history.count");
-    for (let i = 0; i < history.count; i++) {
-      for (let j = 0; j < history.count; j++) {
-        compareEntries(i, j, history);
-      }
+  is(history.count, 2, "history.count");
+  for (let i = 0; i < history.count; i++) {
+    for (let j = 0; j < history.count; j++) {
+      compareEntries(i, j, history);
     }
   }
 
diff --git a/browser/components/sessionstore/test/browser_705597.js b/browser/components/sessionstore/test/browser_705597.js
index d497e46a97..10f4f08863 100644
--- a/browser/components/sessionstore/test/browser_705597.js
+++ b/browser/components/sessionstore/test/browser_705597.js
@@ -26,14 +26,8 @@ function test() {
   let browser = tab.linkedBrowser;
 
   promiseTabState(tab, tabState).then(() => {
-    let entry;
-    if (!Services.appinfo.sessionHistoryInParent) {
-      let sessionHistory = browser.sessionHistory;
-      entry = sessionHistory.legacySHistory.getEntryAtIndex(0);
-    } else {
-      let sessionHistory = browser.browsingContext.sessionHistory;
-      entry = sessionHistory.getEntryAtIndex(0);
-    }
+    let sessionHistory = browser.browsingContext.sessionHistory;
+    let entry = sessionHistory.getEntryAtIndex(0);
 
     whenChildCount(entry, 1, function () {
       whenChildCount(entry, 2, function () {
diff --git a/browser/components/sessionstore/test/browser_707862.js b/browser/components/sessionstore/test/browser_707862.js
index 765c63257f..4559362e21 100644
--- a/browser/components/sessionstore/test/browser_707862.js
+++ b/browser/components/sessionstore/test/browser_707862.js
@@ -26,26 +26,14 @@ function test() {
   let browser = tab.linkedBrowser;
 
   promiseTabState(tab, tabState).then(() => {
-    let entry;
-    if (!Services.appinfo.sessionHistoryInParent) {
-      let sessionHistory = browser.sessionHistory;
-      entry = sessionHistory.legacySHistory.getEntryAtIndex(0);
-    } else {
-      let sessionHistory = browser.browsingContext.sessionHistory;
-      entry = sessionHistory.getEntryAtIndex(0);
-    }
+    let sessionHistory = browser.browsingContext.sessionHistory;
+    let entry = sessionHistory.getEntryAtIndex(0);
 
     whenChildCount(entry, 1, function () {
       whenChildCount(entry, 2, function () {
         promiseBrowserLoaded(browser).then(() => {
-          let newEntry;
-          if (!Services.appinfo.sessionHistoryInParent) {
-            let newSessionHistory = browser.sessionHistory;
-            newEntry = newSessionHistory.legacySHistory.getEntryAtIndex(0);
-          } else {
-            let newSessionHistory = browser.browsingContext.sessionHistory;
-            newEntry = newSessionHistory.getEntryAtIndex(0);
-          }
+          let newSessionHistory = browser.browsingContext.sessionHistory;
+          let newEntry = newSessionHistory.getEntryAtIndex(0);
 
           whenChildCount(newEntry, 0, function () {
             // Make sure that we reset the state.
diff --git a/browser/components/sessionstore/test/browser_async_flushes.js b/browser/components/sessionstore/test/browser_async_flushes.js
index e35593dc30..d0bf039ff2 100644
--- a/browser/components/sessionstore/test/browser_async_flushes.js
+++ b/browser/components/sessionstore/test/browser_async_flushes.js
@@ -44,58 +44,6 @@ add_task(async function test_flush() {
   gBrowser.removeTab(tab);
 });
 
-add_task(async function test_crash() {
-  if (Services.appinfo.sessionHistoryInParent) {
-    // This test relies on frame script message ordering. Since the frame script
-    // is unused with SHIP, there's no guarantee that we'll crash the frame
-    // before we've started the flush.
-    ok(true, "Test relies on frame script message ordering.");
-    return;
-  }
-
-  // Create new tab.
-  let tab = BrowserTestUtils.addTab(gBrowser, URL);
-  gBrowser.selectedTab = tab;
-  let browser = tab.linkedBrowser;
-  await promiseBrowserLoaded(browser);
-
-  // Flush to empty any queued update messages.
-  await TabStateFlusher.flush(browser);
-
-  // There should be one history entry.
-  let { entries } = JSON.parse(ss.getTabState(tab));
-  is(entries.length, 1, "there is a single history entry");
-
-  // Click the link to navigate.
-  await SpecialPowers.spawn(browser, [], async function () {
-    return new Promise(resolve => {
-      docShell.chromeEventHandler.addEventListener(
-        "hashchange",
-        () => resolve(),
-        { once: true, capture: true }
-      );
-
-      // Click the link.
-      content.document.querySelector("a").click();
-    });
-  });
-
-  // Crash the browser and flush. Both messages are async and will be sent to
-  // the content process. The "crash" message makes it first so that we don't
-  // get a chance to process the flush. The TabStateFlusher however should be
-  // notified so that the flush still completes.
-  let promise1 = BrowserTestUtils.crashFrame(browser);
-  let promise2 = TabStateFlusher.flush(browser);
-  await Promise.all([promise1, promise2]);
-
-  // The pending update should be lost.
-  ({ entries } = JSON.parse(ss.getTabState(tab)));
-  is(entries.length, 1, "still only one history entry");
-
-  // Cleanup.
-  gBrowser.removeTab(tab);
-});
-
 add_task(async function test_remove() {
   // Create new tab.
   let tab = BrowserTestUtils.addTab(gBrowser, URL);
diff --git a/browser/components/sessionstore/test/browser_async_remove_tab.js b/browser/components/sessionstore/test/browser_async_remove_tab.js
index 6f744ade3c..28c20512f1 100644
--- a/browser/components/sessionstore/test/browser_async_remove_tab.js
+++ b/browser/components/sessionstore/test/browser_async_remove_tab.js
@@ -92,15 +92,7 @@ add_task(async function save_worthy_tabs_remote_final() {
   ok(browser.isRemoteBrowser, "browser is still remote");
 
   // Remove the tab before the update arrives.
-  let promise = promiseRemoveTabAndSessionState(tab);
-
-  // With SHIP, we'll do the final tab state update sooner than we did before.
-  if (!Services.appinfo.sessionHistoryInParent) {
-    // No tab state worth saving (that we know about yet).
-    ok(!isValueInClosedData(r), "closed tab not saved");
-  }
-
-  await promise;
+  await promiseRemoveTabAndSessionState(tab);
 
   // Turns out there is a tab state worth saving.
   ok(isValueInClosedData(r), "closed tab saved");
@@ -117,15 +109,7 @@ add_task(async function save_worthy_tabs_nonremote_final() {
   ok(!browser.isRemoteBrowser, "browser is not remote anymore");
 
   // Remove the tab before the update arrives.
-  let promise = promiseRemoveTabAndSessionState(tab);
-
-  // With SHIP, we'll do the final tab state update sooner than we did before.
-  if (!Services.appinfo.sessionHistoryInParent) {
-    // No tab state worth saving (that we know about yet).
-    ok(!isValueInClosedData(r), "closed tab not saved");
-  }
-
-  await promise;
+  await promiseRemoveTabAndSessionState(tab);
 
   // Turns out there is a tab state worth saving.
   ok(isValueInClosedData(r), "closed tab saved");
@@ -151,15 +135,7 @@ add_task(async function dont_save_empty_tabs_final() {
   await entryReplaced;
 
   // Remove the tab before the update arrives.
-  let promise = promiseRemoveTabAndSessionState(tab);
-
-  // With SHIP, we'll do the final tab state update sooner than we did before.
-  if (!Services.appinfo.sessionHistoryInParent) {
-    // Tab state deemed worth saving (yet).
-    ok(isValueInClosedData(r), "closed tab saved");
-  }
-
-  await promise;
+  await promiseRemoveTabAndSessionState(tab);
 
   // Turns out we don't want to save the tab state.
   ok(!isValueInClosedData(r), "closed tab not saved");
diff --git a/browser/components/sessionstore/test/browser_async_window_flushing.js b/browser/components/sessionstore/test/browser_async_window_flushing.js
index 56781896d8..56cd3ad1e3 100644
--- a/browser/components/sessionstore/test/browser_async_window_flushing.js
+++ b/browser/components/sessionstore/test/browser_async_window_flushing.js
@@ -116,17 +116,10 @@ add_task(async function test_remove_uninteresting_window() {
   await SpecialPowers.spawn(browser, [], async function () {
     // Epic hackery to make this browser seem suddenly boring.
     docShell.setCurrentURIForSessionStore(Services.io.newURI("about:blank"));
-
-    if (!SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-      let { sessionHistory } = docShell.QueryInterface(Ci.nsIWebNavigation);
-      sessionHistory.legacySHistory.purgeHistory(sessionHistory.count);
-    }
   });
 
-  if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    let { sessionHistory } = browser.browsingContext;
-    sessionHistory.purgeHistory(sessionHistory.count);
-  }
+  let { sessionHistory } = browser.browsingContext;
+  sessionHistory.purgeHistory(sessionHistory.count);
 
   // Once this windowClosed Promise resolves, we should have finished
   // the flush and revisited our decision to put this window into
diff --git a/browser/components/sessionstore/test/browser_attributes.js b/browser/components/sessionstore/test/browser_attributes.js
index 336573a508..db349a31a2 100644
--- a/browser/components/sessionstore/test/browser_attributes.js
+++ b/browser/components/sessionstore/test/browser_attributes.js
@@ -38,45 +38,68 @@ add_task(async function test() {
   ok(tab.hasAttribute("muted"), "tab.muted exists");
 
   // Make sure we do not persist 'image' and 'muted' attributes.
-  ss.persistTabAttribute("image");
-  ss.persistTabAttribute("muted");
   let { attributes } = JSON.parse(ss.getTabState(tab));
   ok(!("image" in attributes), "'image' attribute not saved");
   ok(!("muted" in attributes), "'muted' attribute not saved");
-  ok(!("custom" in attributes), "'custom' attribute not saved");
-
-  // Test persisting a custom attribute.
-  tab.setAttribute("custom", "foobar");
-  ss.persistTabAttribute("custom");
-
-  ({ attributes } = JSON.parse(ss.getTabState(tab)));
-  is(attributes.custom, "foobar", "'custom' attribute is correct");
-
-  // Make sure we're backwards compatible and restore old 'image' attributes.
+  ok(!("customizemode" in attributes), "'customizemode' attribute not saved");
+
+  // Test persisting a customizemode attribute.
+  {
+    let customizationReady = BrowserTestUtils.waitForEvent(
+      gNavToolbox,
+      "customizationready"
+    );
+    gCustomizeMode.enter();
+    await customizationReady;
+  }
+
+  let customizeIcon = gBrowser.getIcon(gBrowser.selectedTab);
+  ({ attributes } = JSON.parse(ss.getTabState(gBrowser.selectedTab)));
+  ok(!("image" in attributes), "'image' attribute not saved");
+  is(attributes.customizemode, "true", "'customizemode' attribute is correct");
+
+  {
+    let afterCustomization = BrowserTestUtils.waitForEvent(
+      gNavToolbox,
+      "aftercustomization"
+    );
+    gCustomizeMode.exit();
+    await afterCustomization;
+  }
+
+  // Test restoring a customizemode tab.
   let state = {
-    entries: [{ url: "about:mozilla", triggeringPrincipal_base64 }],
-    attributes: { custom: "foobaz" },
-    image: gBrowser.getIcon(tab),
+    entries: [],
+    attributes: { customizemode: "true", nonpersisted: "true" },
   };
 
+  // Customize mode doesn't like being restored on top of a non-blank tab.
+  // For the moment, it appears it isn't possible to restore customizemode onto
+  // an existing non-blank tab outside of tests, however this may be a latent
+  // bug if we ever try to do that in the future.
+  let principal = Services.scriptSecurityManager.createNullPrincipal({});
+  tab.linkedBrowser.createAboutBlankContentViewer(principal, principal);
+
   // Prepare a pending tab waiting to be restored.
   let promise = promiseTabRestoring(tab);
   ss.setTabState(tab, JSON.stringify(state));
   await promise;
 
   ok(tab.hasAttribute("pending"), "tab is pending");
-  is(gBrowser.getIcon(tab), state.image, "tab has correct icon");
+  ok(tab.hasAttribute("customizemode"), "tab is in customizemode");
+  ok(!tab.hasAttribute("nonpersisted"), "tab has no nonpersisted attribute");
+  is(gBrowser.getIcon(tab), customizeIcon, "tab has correct icon");
   ok(!state.attributes.image, "'image' attribute not saved");
 
   // Let the pending tab load.
   gBrowser.selectedTab = tab;
-  await promiseTabRestored(tab);
 
   // Ensure no 'image' or 'pending' attributes are stored.
   ({ attributes } = JSON.parse(ss.getTabState(tab)));
   ok(!("image" in attributes), "'image' attribute not saved");
   ok(!("pending" in attributes), "'pending' attribute not saved");
-  is(attributes.custom, "foobaz", "'custom' attribute is correct");
+  ok(!("nonpersisted" in attributes), "'nonpersisted' attribute not saved");
+  is(attributes.customizemode, "true", "'customizemode' attribute is correct");
 
   // Clean up.
   gBrowser.removeTab(tab);
diff --git a/browser/components/sessionstore/test/browser_bfcache_telemetry.js b/browser/components/sessionstore/test/browser_bfcache_telemetry.js
index daa4bcf44e..9e913eb605 100644
--- a/browser/components/sessionstore/test/browser_bfcache_telemetry.js
+++ b/browser/components/sessionstore/test/browser_bfcache_telemetry.js
@@ -39,7 +39,6 @@ async function test_bfcache_telemetry(probeInParent) {
 
 add_task(async () => {
   await test_bfcache_telemetry(
-    Services.appinfo.sessionHistoryInParent &&
-      Services.prefs.getBoolPref("fission.bfcacheInParent")
+    Services.prefs.getBoolPref("fission.bfcacheInParent")
   );
 });
diff --git a/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js b/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js
index 2414e04276..42e7678a92 100644
--- a/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js
+++ b/browser/components/sessionstore/test/browser_docshell_uuid_consistency.js
@@ -4,38 +4,18 @@ add_task(async function duplicateTab() {
   let tab = BrowserTestUtils.addTab(gBrowser, TEST_URL);
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
-  if (!Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(tab.linkedBrowser, [], function () {
-      let docshell = content.window.docShell.QueryInterface(
-        Ci.nsIWebNavigation
-      );
-      let shEntry = docshell.sessionHistory.legacySHistory.getEntryAtIndex(0);
-      is(shEntry.docshellID.toString(), docshell.historyID.toString());
-    });
-  } else {
-    let historyID = tab.linkedBrowser.browsingContext.historyID;
-    let shEntry =
-      tab.linkedBrowser.browsingContext.sessionHistory.getEntryAtIndex(0);
-    is(shEntry.docshellID.toString(), historyID.toString());
-  }
+  let historyID = tab.linkedBrowser.browsingContext.historyID;
+  let shEntry =
+    tab.linkedBrowser.browsingContext.sessionHistory.getEntryAtIndex(0);
+  is(shEntry.docshellID.toString(), historyID.toString());
 
   let tab2 = gBrowser.duplicateTab(tab);
   await BrowserTestUtils.browserLoaded(tab2.linkedBrowser);
 
-  if (!Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(tab2.linkedBrowser, [], function () {
-      let docshell = content.window.docShell.QueryInterface(
-        Ci.nsIWebNavigation
-      );
-      let shEntry = docshell.sessionHistory.legacySHistory.getEntryAtIndex(0);
-      is(shEntry.docshellID.toString(), docshell.historyID.toString());
-    });
-  } else {
-    let historyID = tab2.linkedBrowser.browsingContext.historyID;
-    let shEntry =
-      tab2.linkedBrowser.browsingContext.sessionHistory.getEntryAtIndex(0);
-    is(shEntry.docshellID.toString(), historyID.toString());
-  }
+  historyID = tab2.linkedBrowser.browsingContext.historyID;
+  shEntry =
+    tab2.linkedBrowser.browsingContext.sessionHistory.getEntryAtIndex(0);
+  is(shEntry.docshellID.toString(), historyID.toString());
 
   BrowserTestUtils.removeTab(tab);
   BrowserTestUtils.removeTab(tab2);
@@ -47,24 +27,10 @@ add_task(async function contentToChromeNavigate() {
   let tab = BrowserTestUtils.addTab(gBrowser, TEST_URL);
   await BrowserTestUtils.browserLoaded(tab.linkedBrowser);
 
-  if (!Services.appinfo.sessionHistoryInParent) {
-    await SpecialPowers.spawn(tab.linkedBrowser, [], function () {
-      let docshell = content.window.docShell.QueryInterface(
-        Ci.nsIWebNavigation
-      );
-      let sh = docshell.sessionHistory;
-      is(sh.count, 1);
-      is(
-        sh.legacySHistory.getEntryAtIndex(0).docshellID.toString(),
-        docshell.historyID.toString()
-      );
-    });
-  } else {
-    let historyID = tab.linkedBrowser.browsingContext.historyID;
-    let sh = tab.linkedBrowser.browsingContext.sessionHistory;
-    is(sh.count, 1);
-    is(sh.getEntryAtIndex(0).docshellID.toString(), historyID.toString());
-  }
+  let historyID = tab.linkedBrowser.browsingContext.historyID;
+  let sh = tab.linkedBrowser.browsingContext.sessionHistory;
+  is(sh.count, 1);
+  is(sh.getEntryAtIndex(0).docshellID.toString(), historyID.toString());
 
   // Force the browser to navigate to the chrome process.
   BrowserTestUtils.loadURIString(tab.linkedBrowser, "about:config");
@@ -74,31 +40,17 @@ add_task(async function contentToChromeNavigate() {
   let docShell = tab.linkedBrowser.frameLoader.docShell;
 
   // 'cause we're in the chrome process, we can just directly poke at the shistory.
-  if (!Services.appinfo.sessionHistoryInParent) {
-    let sh = docShell.QueryInterface(Ci.nsIWebNavigation).sessionHistory;
-
-    is(sh.count, 2);
-    is(
-      sh.legacySHistory.getEntryAtIndex(0).docshellID.toString(),
-      docShell.historyID.toString()
-    );
-    is(
-      sh.legacySHistory.getEntryAtIndex(1).docshellID.toString(),
-      docShell.historyID.toString()
-    );
-  } else {
-    let sh = docShell.browsingContext.sessionHistory;
-
-    is(sh.count, 2);
-    is(
-      sh.getEntryAtIndex(0).docshellID.toString(),
-      docShell.historyID.toString()
-    );
-    is(
-      sh.getEntryAtIndex(1).docshellID.toString(),
-      docShell.historyID.toString()
-    );
-  }
+  sh = docShell.browsingContext.sessionHistory;
+
+  is(sh.count, 2);
+  is(
+    sh.getEntryAtIndex(0).docshellID.toString(),
+    docShell.historyID.toString()
+  );
+  is(
+    sh.getEntryAtIndex(1).docshellID.toString(),
+    docShell.historyID.toString()
+  );
 
   BrowserTestUtils.removeTab(tab);
 });
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);
diff --git a/browser/components/sessionstore/test/browser_send_async_message_oom.js b/browser/components/sessionstore/test/browser_send_async_message_oom.js
deleted file mode 100644
index 7e807f2fbd..0000000000
--- a/browser/components/sessionstore/test/browser_send_async_message_oom.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-/* eslint-disable mozilla/no-arbitrary-setTimeout */
-
-const HISTOGRAM_NAME = "FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM";
-
-/**
- * Test that an OOM in sendAsyncMessage in a framescript will be reported
- * to Telemetry.
- */
-
-add_setup(async function () {
-  Services.telemetry.canRecordExtended = true;
-});
-
-function frameScript() {
-  // Make send[A]syncMessage("SessionStore:update", ...) simulate OOM.
-  // Other operations are unaffected.
-  let mm = docShell.messageManager;
-
-  let wrap = function (original) {
-    return function (name, ...args) {
-      if (name != "SessionStore:update") {
-        return original(name, ...args);
-      }
-      throw new Components.Exception(
-        "Simulated OOM",
-        Cr.NS_ERROR_OUT_OF_MEMORY
-      );
-    };
-  };
-
-  mm.sendAsyncMessage = wrap(mm.sendAsyncMessage.bind(mm));
-  mm.sendSyncMessage = wrap(mm.sendSyncMessage.bind(mm));
-}
-
-add_task(async function () {
-  // Capture original state.
-  let snapshot = Services.telemetry.getHistogramById(HISTOGRAM_NAME).snapshot();
-
-  // Open a browser, configure it to cause OOM.
-  let newTab = BrowserTestUtils.addTab(gBrowser, "about:robots");
-  let browser = newTab.linkedBrowser;
-  await ContentTask.spawn(browser, null, frameScript);
-
-  let promiseReported = new Promise(resolve => {
-    browser.messageManager.addMessageListener("SessionStore:error", resolve);
-  });
-
-  // Attempt to flush. This should fail.
-  let promiseFlushed = TabStateFlusher.flush(browser);
-  promiseFlushed.then(success => {
-    if (success) {
-      throw new Error("Flush should have failed");
-    }
-  });
-
-  // The frame script should report an error.
-  await promiseReported;
-
-  // Give us some time to handle that error.
-  await new Promise(resolve => setTimeout(resolve, 10));
-
-  // By now, Telemetry should have been updated.
-  let snapshot2 = Services.telemetry
-    .getHistogramById(HISTOGRAM_NAME)
-    .snapshot();
-  gBrowser.removeTab(newTab);
-
-  Assert.ok(snapshot2.sum > snapshot.sum);
-});
-
-add_task(async function cleanup() {
-  Services.telemetry.canRecordExtended = false;
-});
diff --git a/browser/components/sessionstore/test/browser_sessionHistory.js b/browser/components/sessionstore/test/browser_sessionHistory.js
index ebdf0055e9..a3eb4abd42 100644
--- a/browser/components/sessionstore/test/browser_sessionHistory.js
+++ b/browser/components/sessionstore/test/browser_sessionHistory.js
@@ -296,12 +296,9 @@ add_task(async function test_slow_subframe_load() {
  * Ensure that document wireframes can be persisted when they're enabled.
  */
 add_task(async function test_wireframes() {
-  // Wireframes only works when Fission and SHIP are enabled.
-  if (
-    !Services.appinfo.fissionAutostart ||
-    !Services.appinfo.sessionHistoryInParent
-  ) {
-    ok(true, "Skipping test_wireframes when Fission or SHIP is not enabled.");
+  // Wireframes only works when Fission is enabled.
+  if (!Services.appinfo.fissionAutostart) {
+    ok(true, "Skipping test_wireframes when Fission is not enabled.");
     return;
   }
 
diff --git a/browser/components/sessionstore/test/head.js b/browser/components/sessionstore/test/head.js
index d73c098eea..a43a6ac0a2 100644
--- a/browser/components/sessionstore/test/head.js
+++ b/browser/components/sessionstore/test/head.js
@@ -671,35 +671,9 @@ function setPropertyOfFormField(browserContext, selector, propName, newValue) {
 }
 
 function promiseOnHistoryReplaceEntry(browser) {
-  if (SpecialPowers.Services.appinfo.sessionHistoryInParent) {
-    return new Promise(resolve => {
-      let sessionHistory = browser.browsingContext?.sessionHistory;
-      if (sessionHistory) {
-        var historyListener = {
-          OnHistoryNewEntry() {},
-          OnHistoryGotoIndex() {},
-          OnHistoryPurge() {},
-          OnHistoryReload() {
-            return true;
-          },
-
-          OnHistoryReplaceEntry() {
-            resolve();
-          },
-
-          QueryInterface: ChromeUtils.generateQI([
-            "nsISHistoryListener",
-            "nsISupportsWeakReference",
-          ]),
-        };
-
-        sessionHistory.addSHistoryListener(historyListener);
-      }
-    });
-  }
-
-  return SpecialPowers.spawn(browser, [], () => {
-    return new Promise(resolve => {
+  return new Promise(resolve => {
+    let sessionHistory = browser.browsingContext?.sessionHistory;
+    if (sessionHistory) {
       var historyListener = {
         OnHistoryNewEntry() {},
         OnHistoryGotoIndex() {},
@@ -718,13 +692,8 @@ function promiseOnHistoryReplaceEntry(browser) {
         ]),
       };
 
-      var { sessionHistory } = this.docShell.QueryInterface(
-        Ci.nsIWebNavigation
-      );
-      if (sessionHistory) {
-        sessionHistory.legacySHistory.addSHistoryListener(historyListener);
-      }
-    });
+      sessionHistory.addSHistoryListener(historyListener);
+    }
   });
 }
 
diff --git a/browser/config/version.txt b/browser/config/version.txt
index dc72eb956c..fc305fd9a7 100644
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1 +1 @@
-115.10.0
+115.11.0
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
index bf3417d98d..d34369691a 100644
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1 +1 @@
-115.10.0esr
+115.11.0esr
diff --git a/browser/locales/l10n-changesets.json b/browser/locales/l10n-changesets.json
index 077fa913e5..3aac8da9c1 100644
--- a/browser/locales/l10n-changesets.json
+++ b/browser/locales/l10n-changesets.json
@@ -15,7 +15,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "09170737faea4b3c1002b7b171423b26d6a84249"
+        "revision": "01d0b95d9e814dbe3498ffcc4826536e7bfa982d"
     },
     "af": {
         "pin": false,
@@ -33,7 +33,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f75b56616bce86d35d7224d5d92a619184ad20e3"
+        "revision": "4b4e1ac99efc91c8d452e2fa6493443cd41f7bdd"
     },
     "an": {
         "pin": false,
@@ -51,7 +51,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7dd08c770f7d6467384592dc4a9a9a3271159840"
+        "revision": "a7fb8ee7157c3256bb2bc41ed7de2e32c8fc7fb2"
     },
     "ar": {
         "pin": false,
@@ -69,7 +69,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4c7e24ef78bdc7567d43b849345ae880c8bb20a8"
+        "revision": "c25d000804793caac2244435604876fa7c7ac53b"
     },
     "ast": {
         "pin": false,
@@ -87,7 +87,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "64e0c51ec3b5b947743ed79b4481ce26f32fc5ad"
+        "revision": "9e8adc849e5fd31664f6b34f9c94a9e68d8a17b4"
     },
     "az": {
         "pin": false,
@@ -105,7 +105,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f95282c649779d047fda89692d5d6aad083c1d7b"
+        "revision": "f9a497246603da23af3f8f7cfb6eb93c329fcfa0"
     },
     "be": {
         "pin": false,
@@ -123,7 +123,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0bed491fdb27e5052aef5083a8a10cc68809d071"
+        "revision": "c72d29fbba5665b6d09c8163d70f17c861de5b68"
     },
     "bg": {
         "pin": false,
@@ -141,7 +141,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "612502562eb1788688de1a4973e939c91782ac78"
+        "revision": "9f8e00927a58304657f69e68c45bb08b283c7bb4"
     },
     "bn": {
         "pin": false,
@@ -159,7 +159,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "503468755f8cff15b732e2bb9c3ddf7f3be07380"
+        "revision": "d8cff26d13b63763623a45fc1e0ac2346b1b07ad"
     },
     "br": {
         "pin": false,
@@ -177,7 +177,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7b4ddecda399bc6a8137afc9d2ea8415d02ea5ad"
+        "revision": "90580336afef095faa56a66bf4d002c39bd78733"
     },
     "bs": {
         "pin": false,
@@ -195,7 +195,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0231a77ce204f5b1a8dbf3e06d1d9d2b9aec9261"
+        "revision": "80e6a955d8735d71a89cfb6ac8a76dbee6b47538"
     },
     "ca": {
         "pin": false,
@@ -213,7 +213,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "24d50653ab5c9b99335a8e65cdf4d92ccc6a2b14"
+        "revision": "2de60e3d6d0cadadfe9115752aaad0bd7223c98a"
     },
     "ca-valencia": {
         "pin": false,
@@ -231,7 +231,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8bf62f9aa0cbc1ebb1b1c5d373c48dcd50dbfd9c"
+        "revision": "e79bb891751b8859609abe02840780b675002131"
     },
     "cak": {
         "pin": false,
@@ -249,7 +249,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "aedb8eeab1dbde2eacd079e6c9d1ce134ec338b8"
+        "revision": "87a4bdc479c2957a4a336691e8c30566f718392d"
     },
     "cs": {
         "pin": false,
@@ -267,7 +267,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0d96b6b04bfb8a29ba7040144db80cc47f64b09d"
+        "revision": "609edd15f9a971e3eaa2b6939f4b3ef29bb401a2"
     },
     "cy": {
         "pin": false,
@@ -285,7 +285,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "3d1694ddd8f1b79d6af3fef4404918041d9fe0a9"
+        "revision": "9a284d9a640870b3a94bc40ec6c410539ba13e6c"
     },
     "da": {
         "pin": false,
@@ -303,7 +303,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0a0b774407cc88a245653d3f258147f1bbe466fb"
+        "revision": "2197a99c9a080c756920436e8cf541616f542ae4"
     },
     "de": {
         "pin": false,
@@ -321,7 +321,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "633986260777ba4127fb9e672b96fb46b94b0a9d"
+        "revision": "b7a533e5edc9912add2ed53286a85b4cbffaaffc"
     },
     "dsb": {
         "pin": false,
@@ -339,7 +339,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "74247a862227c161b9a5973bc9e58e50e9bcb56c"
+        "revision": "299b082e1a91ef8acb6446de73f51aee1f2a2622"
     },
     "el": {
         "pin": false,
@@ -357,7 +357,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e2f2d1541e385f8a4d44d7c7e19ae9cd7030f0b6"
+        "revision": "20baf15379d8dc5d6913942bff393c292399000f"
     },
     "en-CA": {
         "pin": false,
@@ -375,7 +375,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "12633b822526555f840e2a6b914362e470307af6"
+        "revision": "23c3ed7ee451bcf07e2e12c68a3ac1e349e95876"
     },
     "en-GB": {
         "pin": false,
@@ -393,7 +393,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e1234cb64b89c34f3a88d8c6b164df35825fe8d9"
+        "revision": "9de9183c97d3bfaa0a90fb7e8b466070c35e25f3"
     },
     "eo": {
         "pin": false,
@@ -411,7 +411,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8fc31a6f9a320f77339ed2d2a53d9ef38555888d"
+        "revision": "1b750fc7abd455d7eac20f9d7922f2d7d7b002bd"
     },
     "es-AR": {
         "pin": false,
@@ -429,7 +429,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "78b3c38741dffc0f17a848e4faf873a1b86d2ca3"
+        "revision": "42228ca4434593daaf0c00730bdb49fc82380082"
     },
     "es-CL": {
         "pin": false,
@@ -447,7 +447,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1335f004be927c39ee0fefb37021a2969519b5e7"
+        "revision": "78d913d7193ab71fa909f7f029874be302672c09"
     },
     "es-ES": {
         "pin": false,
@@ -465,7 +465,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "accf5e4506c03ec14eabb67e5fb79badfefb8f3b"
+        "revision": "beff1baac7c5d71e84eb26c356472af091a82d48"
     },
     "es-MX": {
         "pin": false,
@@ -483,7 +483,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b92e1730f01bcf5499dbb772f17a13abd3a68c58"
+        "revision": "175f671c5b64e680d2fb80bd676d6e4469f8f2e4"
     },
     "et": {
         "pin": false,
@@ -501,7 +501,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d780fe37dfc6ab2be41baa886a83dad3e5e93af4"
+        "revision": "79be34d00ff06d857ad720b8aedf553b6c402501"
     },
     "eu": {
         "pin": false,
@@ -519,7 +519,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "1f33c97dd4b9ded434f47ed1001f7258eabca501"
+        "revision": "f0f0a5d2807fdfe77f7d3eb4ed6eee0cc3997765"
     },
     "fa": {
         "pin": false,
@@ -537,7 +537,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "37aa71d77cb6de6cc9f1d67696f978deef2ade74"
+        "revision": "ebe0b60b0b367779c55a807661e383696401f6b2"
     },
     "ff": {
         "pin": false,
@@ -555,7 +555,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "eb3ca2b29eb8e75b28b723f64eecc2c5ff993117"
+        "revision": "a437fb813f99bb8acb221a8db1000cd078e0bfee"
     },
     "fi": {
         "pin": false,
@@ -573,7 +573,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "dc40a4fd5d0e787da56408576c6d673191827dc6"
+        "revision": "d5ae6a933d714f734e6da192150bbf63f9a61149"
     },
     "fr": {
         "pin": false,
@@ -591,7 +591,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "415c1f0e84bd3287d07ed84aa23ce4da4673d46f"
+        "revision": "496c2eb73b82d5bb7fc3a10ccd159f3df0d76e7c"
     },
     "fur": {
         "pin": false,
@@ -609,7 +609,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c0f7e4e5ccca3f2c98a4d3c039f571310e95a08c"
+        "revision": "16d5fc065f997ad6db555debb9eb75bd096dda30"
     },
     "fy-NL": {
         "pin": false,
@@ -627,7 +627,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "45d949d7a90e669b8b9f4f7d950c336ea91de987"
+        "revision": "b9ae5d7ce6f436f239478b2a6386edaa9cc6757a"
     },
     "ga-IE": {
         "pin": false,
@@ -645,7 +645,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d271f275cf48a006acf046519793dde34bd0fbeb"
+        "revision": "2fcccb5b19b300f4368399f83f38c962de907e6f"
     },
     "gd": {
         "pin": false,
@@ -663,7 +663,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2b950e306295533e891ebf5ad4bdc945f1afc503"
+        "revision": "f89f7d0090410bd6071fdd10acdb725fd42dc683"
     },
     "gl": {
         "pin": false,
@@ -681,7 +681,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a060dd864d61fd4d074d3d558955dcdb57c1c35e"
+        "revision": "d60053a8338abc292231feb6c72a480cbfe09282"
     },
     "gn": {
         "pin": false,
@@ -699,7 +699,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "372cc7e9a7d3da912da9f911b261110d0d5e2c6f"
+        "revision": "2f630869db524c00f32f2c1a86cb74dfa6b96e8c"
     },
     "gu-IN": {
         "pin": false,
@@ -717,7 +717,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "ae2b9c18cfab55abf7ac8a50e371c3d8dd714060"
+        "revision": "6e7a555c8a2d8a0df4791c49636b735b2e3e892b"
     },
     "he": {
         "pin": false,
@@ -735,7 +735,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "46f8d7c031a6a4cd9ce99fd6d2fa1d97049aa9fb"
+        "revision": "c53cea027f8f98f9b672232d2bb3a129fc8669f7"
     },
     "hi-IN": {
         "pin": false,
@@ -753,7 +753,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0061583f8a467014c7267e52745986f405aa8468"
+        "revision": "3226adb8b31f20b5a1e511c39d96475bd981c64f"
     },
     "hr": {
         "pin": false,
@@ -771,7 +771,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "3244c23d50d1ef88729b015af3829053e831b4a3"
+        "revision": "da0cae20d707fde4238bcb079bc9c9a572ca70ad"
     },
     "hsb": {
         "pin": false,
@@ -789,7 +789,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "10dec0b4c8a0f360a86ed2c734d260d3d5928773"
+        "revision": "1e13c9b155321cb9b904386d5c90736baaf52f9b"
     },
     "hu": {
         "pin": false,
@@ -807,7 +807,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "086ac0260d6b5adc2a40751ac18d00ee6f32fdc5"
+        "revision": "5a76dd3b5d5ca290e2d3bed08cd2378c0a89f4bc"
     },
     "hy-AM": {
         "pin": false,
@@ -825,7 +825,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "932f864ceb4b455ea072ab4fde99768ed6892743"
+        "revision": "dc1b03d7cfb8d6aba009ce32c2198f10b4ffab5f"
     },
     "ia": {
         "pin": false,
@@ -843,7 +843,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b8ce45c9cc30ffd2839f6f566c3322fda1579fc7"
+        "revision": "0a8e921a71ddea28aa8279d9cc30a2c228514285"
     },
     "id": {
         "pin": false,
@@ -861,7 +861,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f03a6b3069a51f4142fa6f6df11df96b3ada8a55"
+        "revision": "6e6de17dcac401dbb916db954c39c571c13995bf"
     },
     "is": {
         "pin": false,
@@ -879,7 +879,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "5c4b61165e1dbb5bb5c053bc88056520abc985d4"
+        "revision": "536265635dfec9c1f466d9716b9ef0ad28ac7a09"
     },
     "it": {
         "pin": false,
@@ -897,7 +897,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "07d5e1ff5f9b76a48b141ecbea23d20061bd969c"
+        "revision": "91951e37e2b85976c6a2cf42f2412e77433eca13"
     },
     "ja": {
         "pin": false,
@@ -913,7 +913,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "e6f9db9ce3e67576196c0e888bb8628a300ab8af"
+        "revision": "895dcf8bb52453b39c8953adb81b2cb728c4465d"
     },
     "ja-JP-mac": {
         "pin": false,
@@ -921,7 +921,7 @@
             "macosx64",
             "macosx64-devedition"
         ],
-        "revision": "b166ef1a805efb1ab0ee998108213de08e5be069"
+        "revision": "90a5078ce63ddff8cc0eb1e8f15bc0cb05483ce8"
     },
     "ka": {
         "pin": false,
@@ -939,7 +939,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a15eb9feea2cc1add03a14b2a2d7e2a41deaabdc"
+        "revision": "d0819a64fc401ea706eb618da80438765b636aeb"
     },
     "kab": {
         "pin": false,
@@ -957,7 +957,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4d619e0aace95075132d8e708a8f9055f95a784f"
+        "revision": "f2e6e32f3903bd964eca9919dad4ce24c69aa61f"
     },
     "kk": {
         "pin": false,
@@ -975,7 +975,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b6a707bf746107ef1dd3979b973f06a85d61aa2d"
+        "revision": "0d31157370f1ccafab11b1a144de43d227512e2e"
     },
     "km": {
         "pin": false,
@@ -993,7 +993,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "006435264ce37b6daf75558316730614936ce5e8"
+        "revision": "34fd1eee4268442bde103bae424da5e03350ef01"
     },
     "kn": {
         "pin": false,
@@ -1011,7 +1011,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2bd68cc25a04fe321dac1ad6fa102c1424976e8f"
+        "revision": "5290237e824838c10238776252c2404eafd17318"
     },
     "ko": {
         "pin": false,
@@ -1029,7 +1029,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "805b85981696e9145d1a677c6624abe100267fc0"
+        "revision": "6ef881aff44bb92e5a6a95f369064c4c339620b9"
     },
     "lij": {
         "pin": false,
@@ -1047,7 +1047,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "7c0f7f96530b48bd7ce46df25645ec91581ee19e"
+        "revision": "d5074f9a22e6fa13c5ee8abc60636ce37e658716"
     },
     "lt": {
         "pin": false,
@@ -1065,7 +1065,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "943a26276832c09522fc9134e9f930cb0506f497"
+        "revision": "afcbc29a15e5429879fd336d16e2627b57549e31"
     },
     "lv": {
         "pin": false,
@@ -1083,7 +1083,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c67ce680ac800c004b22b9787166be20a7aae201"
+        "revision": "9e9a2a3c2432a27f48559d94f26e2a207dc99d84"
     },
     "mk": {
         "pin": false,
@@ -1101,7 +1101,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fbef80de5499995a75db64bf06903e16f22dee4e"
+        "revision": "84f3d6c7e2dacce64f1ec9eb845a2ba1f6ca5849"
     },
     "mr": {
         "pin": false,
@@ -1119,7 +1119,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "019be6e3370b7a27e434d3a61e5f229160d4ed84"
+        "revision": "e5561a32b37ee3e26032b1ab534df138de588e49"
     },
     "ms": {
         "pin": false,
@@ -1137,7 +1137,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "20ec0915ec354d674a835ace3615aebfdf7f5219"
+        "revision": "c9ec27a5db3da7cec0ae60128506692f6dcbe17e"
     },
     "my": {
         "pin": false,
@@ -1155,7 +1155,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "4ab6f0d05aa6ead61e2ba4ff34dff79a696b9318"
+        "revision": "5c1480ccc04021dbf4fde8d04ffab591d26fe80b"
     },
     "nb-NO": {
         "pin": false,
@@ -1173,7 +1173,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "561b0cd86ec1561ca575ce663d4e21f5b43cda41"
+        "revision": "fc1896a0a24d1ae5708a76aea1f437fda566ce84"
     },
     "ne-NP": {
         "pin": false,
@@ -1191,7 +1191,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6367a1ca431c536985f8cab4597e569329bf9ba8"
+        "revision": "8c9eac262db978fca8fc3a5c70f032bc3f3776ff"
     },
     "nl": {
         "pin": false,
@@ -1209,7 +1209,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "2a55df0cc3892d7f8dc789c33f377a64debe3c85"
+        "revision": "7e6da4f01bdbfd9615d541073109a1dd1371792e"
     },
     "nn-NO": {
         "pin": false,
@@ -1227,7 +1227,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f1e4c9dfd98e74f5bbd21e137f58bd4cf008e0f0"
+        "revision": "c3d8b68621dab95b03dbb55b1fa61b7662eb6444"
     },
     "oc": {
         "pin": false,
@@ -1245,7 +1245,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f562a64f01acb4acc47f51e46619232a83a7068f"
+        "revision": "a550cf8ec350953cf895a3f84f7e657965b17303"
     },
     "pa-IN": {
         "pin": false,
@@ -1263,7 +1263,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f7f5f1096400869357e85aa17155cfd7a5d8cb86"
+        "revision": "7531f541ae0ac61c3579417475e67ae5d399edfa"
     },
     "pl": {
         "pin": false,
@@ -1281,7 +1281,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a64a7dab01c4ee4bcdc765de6cd03a0b2defeaa9"
+        "revision": "e86a451a9cb5fd5e6dc796735317261280697fe6"
     },
     "pt-BR": {
         "pin": false,
@@ -1299,7 +1299,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "33bf2a9f4c49e719ecb305dec731c83b94b5cccd"
+        "revision": "94c3dbb67a5d8c6047f4a16750de0297e5e55b3b"
     },
     "pt-PT": {
         "pin": false,
@@ -1317,7 +1317,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "051c2c722aad78ac8327d7c919a54bdf65ef2c9b"
+        "revision": "76783945baff030a643ea073164d64ffd35937b0"
     },
     "rm": {
         "pin": false,
@@ -1335,7 +1335,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b97faa95a0c7083253ec08230f74290ad45ea357"
+        "revision": "34552c78b72222b6f21d664df253dd4eb75e741f"
     },
     "ro": {
         "pin": false,
@@ -1353,7 +1353,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "a367feeadd33275bcf1584719c45a401db376e84"
+        "revision": "470b13b5805b83864f3d6acee12747dfe38703de"
     },
     "ru": {
         "pin": false,
@@ -1371,7 +1371,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "528b76d6aaca450ecde21fd12ad3bb5aa13dc925"
+        "revision": "402b2ecbf04d3e3ab9258f103d4e97e7ea2d107c"
     },
     "sc": {
         "pin": false,
@@ -1389,7 +1389,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "64a2a98ded661dc9540df18dfaf3341983d96461"
+        "revision": "a2964e3447a3a8de26ceb31fe8f31273bb4fa050"
     },
     "sco": {
         "pin": false,
@@ -1407,7 +1407,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "da7bf2f8f68856930d61dae836d25c422837a8ee"
+        "revision": "b0e67df5c86da77177388bcd8010bd22445e2230"
     },
     "si": {
         "pin": false,
@@ -1425,7 +1425,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "dae09adba9b54655fbc84a3583726d6b45f613df"
+        "revision": "05344a3721f083f18ba8fa427f742939724eb409"
     },
     "sk": {
         "pin": false,
@@ -1443,7 +1443,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0dc3e74cf7ec420f7a288f1d6f549d7e9da930e3"
+        "revision": "af01c2969bb64ea5493ff7997ba318ff928e5065"
     },
     "sl": {
         "pin": false,
@@ -1461,7 +1461,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "8f1f703422a54854a6c145b3b4fd271143078932"
+        "revision": "0692f748e6fe6397c049f0586dee54b5cbd6c62b"
     },
     "son": {
         "pin": false,
@@ -1479,7 +1479,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6bf85312780bcff64c8879897ec811a2726d1e43"
+        "revision": "fc8d6dee9c1a803a0f6ef9f51583a47068301269"
     },
     "sq": {
         "pin": false,
@@ -1497,7 +1497,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "fa28d9d79cd3fde0d37d3459019446a8b2c5beab"
+        "revision": "f637484e72b685f254224dbb7dc65f45414f6f91"
     },
     "sr": {
         "pin": false,
@@ -1515,7 +1515,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "47887eb6e6d9818ede91d5277ec943e4819d0a83"
+        "revision": "944c72f995e4c8983920eb88cacbf187e145407d"
     },
     "sv-SE": {
         "pin": false,
@@ -1533,7 +1533,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "cc8e8962e59c94b97b70db64bf41e0b87a8ede53"
+        "revision": "bb2d5d96d69ef9fb98ed291232344aa863e237bd"
     },
     "szl": {
         "pin": false,
@@ -1551,7 +1551,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d8acb10b26c9347971b547157b60bc5b19be1796"
+        "revision": "a8afff859aca86ae43810fcf8b6b45a5ed753ad4"
     },
     "ta": {
         "pin": false,
@@ -1569,7 +1569,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "eafb88f45784c47606333379ccf7c95bcf5d8faa"
+        "revision": "19b03e8569563cb3e5991a27e980baf897b88bd1"
     },
     "te": {
         "pin": false,
@@ -1587,7 +1587,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "42666d51ccf74a64e8c86519470ce53d0afc3093"
+        "revision": "4e32fe69464240002479e3c87ef13f039166c9ce"
     },
     "tg": {
         "pin": false,
@@ -1605,7 +1605,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "76c1aaea44b1f1299627101fd304cd4df52a70c5"
+        "revision": "fedff34feae8325766d7ca970f8eaaebac207134"
     },
     "th": {
         "pin": false,
@@ -1623,7 +1623,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "d361502c559ef169c866b6fff0ff3cad0e7ddd5e"
+        "revision": "0e6c56bf2ac9f3596e99646e8b8e880b2bde5502"
     },
     "tl": {
         "pin": false,
@@ -1641,7 +1641,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c15307863103ae3cb7c6859888a32051d98d3530"
+        "revision": "d1c7cd905296829b32e00ed97c16f07216e591a6"
     },
     "tr": {
         "pin": false,
@@ -1659,7 +1659,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "f6173aca47620504c5bb9a20eb5cf9c7dadb852a"
+        "revision": "91e611ae3f19ef8be9dde02414b3140827aa68ba"
     },
     "trs": {
         "pin": false,
@@ -1677,7 +1677,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "87850b4b6da8190359bc0837850cee17e3a93bbe"
+        "revision": "269c1be15683651ee2cac1ad55dea4ad6da43aa6"
     },
     "uk": {
         "pin": false,
@@ -1695,7 +1695,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "c5ad4d4f70ebe7db1265f24fc89237808219b34c"
+        "revision": "99d5ffa0b81e03f66693a61c128237572f6810ee"
     },
     "ur": {
         "pin": false,
@@ -1713,7 +1713,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "46cb98f8118cd844018df84eeb1f4f9d85d79a01"
+        "revision": "02ab0cc3169d110862ba0dfed1133d25070d03e3"
     },
     "uz": {
         "pin": false,
@@ -1731,7 +1731,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "6eee9399633944011a3ebecc45fa0d5de758e81e"
+        "revision": "8ad4e2f1c365f50e4c79976a94fe364d457c9141"
     },
     "vi": {
         "pin": false,
@@ -1749,7 +1749,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "0e75c226763d2548044afe1d0f7b2b3158b7c56d"
+        "revision": "5fd44724e22de01fe90767faba16be42236b7f7e"
     },
     "xh": {
         "pin": false,
@@ -1767,7 +1767,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "b0a85e71398518c848ecf0512fa5f7c0afdcfb4c"
+        "revision": "802582e42c552f5412369d56855c53bc0ffe0665"
     },
     "zh-CN": {
         "pin": false,
@@ -1785,7 +1785,7 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "df2d025ed63149f522134e928a3977b331b12873"
+        "revision": "081aeb1aa3080ea25c46b15950cb3257d791ec35"
     },
     "zh-TW": {
         "pin": false,
@@ -1803,6 +1803,6 @@
             "win64-aarch64-devedition",
             "win64-devedition"
         ],
-        "revision": "11f8d68148a4c6aa5b496f57c2f466347e1e4827"
+        "revision": "9015a180602e18b71d4068f6581557542b392344"
     }
 }
\ No newline at end of file