Adding upstream version 126.0.upstream/126.0

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

4 files changed, 55 insertions, 6 deletions

diff --git a/browser/components/tests/browser/browser_contentpermissionprompt.js b/browser/components/tests/browser/browser_contentpermissionprompt.js
index 3e2eb24f62..11b18a6653 100644
--- a/browser/components/tests/browser/browser_contentpermissionprompt.js
+++ b/browser/components/tests/browser/browser_contentpermissionprompt.js
@@ -151,7 +151,7 @@ add_task(async function test_working_request() {
     },
   };
 
-  let integration = base => ({
+  let integration = () => ({
     createPermissionPrompt(type, request) {
       Assert.equal(type, "test-permission-type");
       Assert.ok(
diff --git a/browser/components/tests/browser/browser_default_webprotocol_handler_mailto.js b/browser/components/tests/browser/browser_default_webprotocol_handler_mailto.js
index d061d84b23..7bb8b22a98 100644
--- a/browser/components/tests/browser/browser_default_webprotocol_handler_mailto.js
+++ b/browser/components/tests/browser/browser_default_webprotocol_handler_mailto.js
@@ -11,12 +11,43 @@ add_setup(function add_setup() {
   Services.prefs.setBoolPref("browser.mailto.dualPrompt", true);
 });
 
+/* helper function to delete site specific settings needed to clean up
+ * the testing setup after some of these tests.
+ *
+ * @see: nsIContentPrefService2.idl
+ */
+function _deleteSiteSpecificSetting(domain, setting, context = null) {
+  const contentPrefs = Cc["@mozilla.org/content-pref/service;1"].getService(
+    Ci.nsIContentPrefService2
+  );
+
+  return contentPrefs.removeByDomainAndName(domain, setting, context, {
+    handleResult(_) {},
+    handleCompletion() {
+      Assert.ok(true, "setting successfully deleted.");
+    },
+    handleError(_) {
+      Assert.ok(false, "could not delete site specific setting.");
+    },
+  });
+}
+
 // site specific settings
 const protocol = "mailto";
-const sss_domain = "test.example.com";
+const subdomain = (Math.random() + 1).toString(36).substring(7);
+const sss_domain = subdomain + ".example.com";
 const ss_setting = "system.under.test";
 
 add_task(async function check_null_value() {
+  Assert.ok(
+    /[a-z0-9].+\.[a-z]+\.[a-z]+/.test(sss_domain),
+    "test the validity of this random domain name before using it for tests: '" +
+      sss_domain +
+      "'"
+  );
+});
+
+add_task(async function check_null_value() {
   Assert.equal(
     null,
     await WebProtocolHandlerRegistrar._getSiteSpecificSetting(
@@ -46,13 +77,31 @@ add_task(async function check_save_value() {
     ss_setting,
     ss_setting
   );
+
+  let fetchedSiteSpecificSetting;
+  try {
+    fetchedSiteSpecificSetting =
+      await WebProtocolHandlerRegistrar._getSiteSpecificSetting(
+        sss_domain,
+        ss_setting
+      );
+  } finally {
+    // make sure the cleanup happens, no matter what
+    _deleteSiteSpecificSetting(sss_domain, ss_setting);
+  }
   Assert.equal(
     ss_setting,
+    fetchedSiteSpecificSetting,
+    "site specific setting save and retrieve test."
+  );
+
+  Assert.equal(
+    null,
     await WebProtocolHandlerRegistrar._getSiteSpecificSetting(
       sss_domain,
       ss_setting
     ),
-    "site specific setting save and retrieve test."
+    "site specific setting should not exist after delete."
   );
 });
 
diff --git a/browser/components/tests/browser/browser_quit_disabled.js b/browser/components/tests/browser/browser_quit_disabled.js
index 3b7e99a1bf..a2151e8953 100644
--- a/browser/components/tests/browser/browser_quit_disabled.js
+++ b/browser/components/tests/browser/browser_quit_disabled.js
@@ -27,7 +27,7 @@ add_task(async function test_quit_shortcut_disabled() {
 
     let quitRequested = false;
     let observer = {
-      observe(subject, topic, data) {
+      observe(subject, topic) {
         is(topic, "quit-application-requested", "Right observer topic");
         ok(shouldQuit, "Quit shortcut should NOT have worked");
 
diff --git a/browser/components/tests/browser/head.js b/browser/components/tests/browser/head.js
index 89c8df8613..28b14aef0b 100644
--- a/browser/components/tests/browser/head.js
+++ b/browser/components/tests/browser/head.js
@@ -42,7 +42,7 @@ function mockShell(overrides = {}) {
     isDefault: false,
     isPinned: false,
 
-    async checkPinCurrentAppToTaskbarAsync(privateBrowsing = false) {
+    async checkPinCurrentAppToTaskbarAsync() {
       if (!this.canPin) {
         throw Error;
       }
@@ -50,7 +50,7 @@ function mockShell(overrides = {}) {
     get isAppInDock() {
       return this.isPinned;
     },
-    isCurrentAppPinnedToTaskbarAsync(privateBrowsing = false) {
+    isCurrentAppPinnedToTaskbarAsync() {
       return Promise.resolve(this.isPinned);
     },
     isDefaultBrowser() {