Merging upstream version 127.0.

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

1 files changed, 8 insertions, 12 deletions

diff --git a/toolkit/components/places/tests/favicons/test_cached-favicon_mime_type.js b/toolkit/components/places/tests/favicons/test_cached-favicon_mime_type.js
index c1f6689a70..52eb81ae85 100644
--- a/toolkit/components/places/tests/favicons/test_cached-favicon_mime_type.js
+++ b/toolkit/components/places/tests/favicons/test_cached-favicon_mime_type.js
@@ -68,14 +68,12 @@ add_task(async function () {
   info("Test that the content type of a favicon we add is correct.");
   let testURI = uri("http://mozilla.org/");
   // Add the data before opening
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.addVisits(testURI);
+  await PlacesTestUtils.setFaviconForPage(
+    testURI,
     testIconURI,
-    testFaviconData,
-    0,
-    systemPrincipal
+    testFaviconData
   );
-  await PlacesTestUtils.addVisits(testURI);
-  await setFaviconForPage(testURI, testIconURI);
   // Open the channel
   let channel = NetUtil.newChannel({
     uri: PlacesUtils.favicons.getFaviconLinkForIcon(testIconURI).spec,
@@ -120,14 +118,12 @@ add_task(async function test_userpass() {
       CACHED_ICON_NORMAL,
       CACHED_ICON_USERPASS,
     ]) {
-      PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+      await PlacesTestUtils.addVisits(pageURI);
+      await PlacesTestUtils.setFaviconForPage(
+        pageURI,
         iconURI,
-        testFaviconData,
-        0,
-        systemPrincipal
+        testFaviconData
       );
-      await PlacesTestUtils.addVisits(pageURI);
-      await setFaviconForPage(pageURI, iconURI);
 
       // Open the channel
       let channel = NetUtil.newChannel({