Merging upstream version 127.0.

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

3 files changed, 10 insertions, 85 deletions

diff --git a/browser/base/content/test/alerts/browser.toml b/browser/base/content/test/alerts/browser.toml
index d0d56f7392..aaca2ba7dc 100644
--- a/browser/base/content/test/alerts/browser.toml
+++ b/browser/base/content/test/alerts/browser.toml
@@ -19,10 +19,6 @@ skip-if = ["os == 'win'"] # Bug 1411118
 https_first_disabled = true
 skip-if = ["os == 'win'"] # Bug 1411118
 
-["browser_notification_replace.js"]
-https_first_disabled = true
-skip-if = ["os == 'win'"] # Bug 1422928
-
 ["browser_notification_tab_switching.js"]
 https_first_disabled = true
 skip-if = ["os == 'win'"] # Bug 1243263
diff --git a/browser/base/content/test/alerts/browser_notification_close.js b/browser/base/content/test/alerts/browser_notification_close.js
index 7568f1cc2d..3fd50bed5b 100644
--- a/browser/base/content/test/alerts/browser_notification_close.js
+++ b/browser/base/content/test/alerts/browser_notification_close.js
@@ -21,17 +21,16 @@ add_task(async function test_notificationClose() {
   Services.prefs.setBoolPref("alerts.showFavicons", true);
 
   await PlacesTestUtils.addVisits(notificationURI);
-  let faviconURI = await new Promise(resolve => {
-    let uri = makeURI(
-      "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4//8/AAX+Av7czFnnAAAAAElFTkSuQmCC"
-    );
-    PlacesUtils.favicons.setAndFetchFaviconForPage(
+  let dataURL = makeURI(
+    "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVQI12P4//8/AAX+Av7czFnnAAAAAElFTkSuQmCC"
+  );
+  await new Promise(resolve => {
+    PlacesUtils.favicons.setFaviconForPage(
       notificationURI,
-      uri,
-      true,
-      PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
-      uriResult => resolve(uriResult),
-      Services.scriptSecurityManager.getSystemPrincipal()
+      dataURL,
+      dataURL,
+      null,
+      resolve
     );
   });
 
@@ -67,11 +66,7 @@ add_task(async function test_notificationClose() {
         "Body text of notification should be present"
       );
       let alertIcon = alertWindow.document.getElementById("alertIcon");
-      is(
-        alertIcon.src,
-        faviconURI.spec,
-        "Icon of notification should be present"
-      );
+      is(alertIcon.src, dataURL.spec, "Icon of notification should be present");
 
       let alertCloseButton = alertWindow.document.querySelector(".close-icon");
       is(alertCloseButton.localName, "toolbarbutton", "close button found");
diff --git a/browser/base/content/test/alerts/browser_notification_replace.js b/browser/base/content/test/alerts/browser_notification_replace.js
deleted file mode 100644
index 9c72e90ab1..0000000000
--- a/browser/base/content/test/alerts/browser_notification_replace.js
+++ /dev/null
@@ -1,66 +0,0 @@
-"use strict";
-
-let notificationURL =
-  // eslint-disable-next-line @microsoft/sdl/no-insecure-url
-  "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
-
-add_task(async function test_notificationReplace() {
-  await addNotificationPermission(notificationURL);
-
-  await BrowserTestUtils.withNewTab(
-    {
-      gBrowser,
-      url: notificationURL,
-    },
-    async function dummyTabTask(aBrowser) {
-      await SpecialPowers.spawn(aBrowser, [], async function () {
-        let win = content.window.wrappedJSObject;
-        let notification = win.showNotification1();
-        let promiseCloseEvent = ContentTaskUtils.waitForEvent(
-          notification,
-          "close"
-        );
-
-        let showEvent = await ContentTaskUtils.waitForEvent(
-          notification,
-          "show"
-        );
-        Assert.equal(
-          showEvent.target.body,
-          "Test body 1",
-          "Showed tagged notification"
-        );
-
-        let newNotification = win.showNotification2();
-        let newShowEvent = await ContentTaskUtils.waitForEvent(
-          newNotification,
-          "show"
-        );
-        Assert.equal(
-          newShowEvent.target.body,
-          "Test body 2",
-          "Showed new notification with same tag"
-        );
-
-        let closeEvent = await promiseCloseEvent;
-        Assert.equal(
-          closeEvent.target.body,
-          "Test body 1",
-          "Closed previous tagged notification"
-        );
-
-        let promiseNewCloseEvent = ContentTaskUtils.waitForEvent(
-          newNotification,
-          "close"
-        );
-        newNotification.close();
-        let newCloseEvent = await promiseNewCloseEvent;
-        Assert.equal(
-          newCloseEvent.target.body,
-          "Test body 2",
-          "Closed new notification"
-        );
-      });
-    }
-  );
-});