Merging upstream version 126.0.

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

2 files changed, 1 insertions, 17 deletions

diff --git a/browser/components/pagedata/.eslintrc.js b/browser/components/pagedata/.eslintrc.js
index 8ead689bcc..aac2436d20 100644
--- a/browser/components/pagedata/.eslintrc.js
+++ b/browser/components/pagedata/.eslintrc.js
@@ -5,8 +5,6 @@
 "use strict";
 
 module.exports = {
-  extends: ["plugin:mozilla/require-jsdoc"],
-
   rules: {
     "mozilla/var-only-at-top-level": "error",
     "no-unused-expressions": "error",
diff --git a/browser/components/pagedata/PageDataService.sys.mjs b/browser/components/pagedata/PageDataService.sys.mjs
index 7160705c27..3cc93ead39 100644
--- a/browser/components/pagedata/PageDataService.sys.mjs
+++ b/browser/components/pagedata/PageDataService.sys.mjs
@@ -10,7 +10,6 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
-  E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
   HiddenFrame: "resource://gre/modules/HiddenFrame.sys.mjs",
 });
 
@@ -542,19 +541,8 @@ export const PageDataService = new (class PageDataService extends EventEmitter {
         this.#backgroundBrowsers.set(browser, resolve);
 
         let principal = Services.scriptSecurityManager.getSystemPrincipal();
-        let oa = lazy.E10SUtils.predictOriginAttributes({
-          browser,
-        });
         let loadURIOptions = {
           triggeringPrincipal: principal,
-          remoteType: lazy.E10SUtils.getRemoteTypeForURI(
-            url,
-            true,
-            false,
-            lazy.E10SUtils.DEFAULT_REMOTE_TYPE,
-            null,
-            oa
-          ),
         };
         browser.fixupAndLoadURIString(url, loadURIOptions);
 
@@ -573,10 +561,8 @@ export const PageDataService = new (class PageDataService extends EventEmitter {
    *   The notification's subject.
    * @param {string} topic
    *   The notification topic.
-   * @param {string} data
-   *   The data associated with the notification.
    */
-  observe(subject, topic, data) {
+  observe(subject, topic) {
     switch (topic) {
       case "idle":
         lazy.logConsole.debug("User went idle");