1 files changed, 28 insertions, 39 deletions

diff --git a/toolkit/components/places/tests/favicons/test_root_icons.js b/toolkit/components/places/tests/favicons/test_root_icons.js
index f0487cc162..5a101ed6a6 100644
--- a/toolkit/components/places/tests/favicons/test_root_icons.js
+++ b/toolkit/components/places/tests/favicons/test_root_icons.js
@@ -9,13 +9,11 @@ add_task(async function () {
   let pageURI = NetUtil.newURI("http://www.places.test/page/");
   await PlacesTestUtils.addVisits(pageURI);
   let faviconURI = NetUtil.newURI("http://www.places.test/favicon.ico");
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.setFaviconForPage(
+    pageURI,
     faviconURI,
-    SMALLPNG_DATA_URI.spec,
-    0,
-    systemPrincipal
+    SMALLPNG_DATA_URI
   );
-  await setFaviconForPage(pageURI, faviconURI);
 
   // Sanity checks.
   Assert.equal(await getFaviconUrlForPage(pageURI), faviconURI.spec);
@@ -70,22 +68,18 @@ add_task(async function test_removePagesByTimeframe() {
 
   // Add a normal icon to the most recent page.
   let faviconURI = NetUtil.newURI(`${BASE_URL}/page/favicon.ico`);
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.setFaviconForPage(
+    pageURI,
     faviconURI,
-    SMALLSVG_DATA_URI.spec,
-    0,
-    systemPrincipal
+    SMALLSVG_DATA_URI
   );
-  await setFaviconForPage(pageURI, faviconURI);
   // Add a root icon to the most recent page.
   let rootIconURI = NetUtil.newURI(`${BASE_URL}/favicon.ico`);
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.setFaviconForPage(
+    pageURI,
     rootIconURI,
-    SMALLPNG_DATA_URI.spec,
-    0,
-    systemPrincipal
+    SMALLPNG_DATA_URI
   );
-  await setFaviconForPage(pageURI, rootIconURI);
 
   // Sanity checks.
   Assert.equal(
@@ -141,13 +135,11 @@ add_task(async function test_different_host() {
   let pageURI = NetUtil.newURI("http://places.test/page/");
   await PlacesTestUtils.addVisits(pageURI);
   let faviconURI = NetUtil.newURI("http://mozilla.test/favicon.ico");
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.setFaviconForPage(
+    pageURI,
     faviconURI,
-    SMALLPNG_DATA_URI.spec,
-    0,
-    systemPrincipal
+    SMALLPNG_DATA_URI
   );
-  await setFaviconForPage(pageURI, faviconURI);
 
   Assert.equal(
     await getFaviconUrlForPage(pageURI),
@@ -166,16 +158,25 @@ add_task(async function test_different_host() {
 add_task(async function test_same_size() {
   // Add two icons with the same size, one is a root icon. Check that the
   // non-root icon is preferred when a smaller size is requested.
-  let data = readFileData(do_get_file("favicon-normal32.png"));
+  let dataURL = await readFileDataAsDataURL(
+    do_get_file("favicon-normal32.png"),
+    "image/png"
+  );
   let pageURI = NetUtil.newURI("http://new_places.test/page/");
   await PlacesTestUtils.addVisits(pageURI);
 
   let faviconURI = NetUtil.newURI("http://new_places.test/favicon.ico");
-  PlacesUtils.favicons.replaceFaviconData(faviconURI, data, "image/png");
-  await setFaviconForPage(pageURI, faviconURI);
+  await PlacesTestUtils.setFaviconForPage(
+    pageURI.spec,
+    faviconURI.spec,
+    dataURL
+  );
   faviconURI = NetUtil.newURI("http://new_places.test/another_icon.ico");
-  PlacesUtils.favicons.replaceFaviconData(faviconURI, data, "image/png");
-  await setFaviconForPage(pageURI, faviconURI);
+  await PlacesTestUtils.setFaviconForPage(
+    pageURI.spec,
+    faviconURI.spec,
+    dataURL
+  );
 
   Assert.equal(
     await getFaviconUrlForPage(pageURI, 20),
@@ -207,13 +208,7 @@ add_task(async function test_root_on_different_host() {
   // Root favicon for TEST_URL1.
   const ICON_URL = "http://places1.test/favicon.ico";
   let iconURI = NetUtil.newURI(ICON_URL);
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
-    iconURI,
-    SMALLPNG_DATA_URI.spec,
-    0,
-    systemPrincipal
-  );
-  await setFaviconForPage(pageURI1, iconURI);
+  await PlacesTestUtils.setFaviconForPage(pageURI1, iconURI, SMALLPNG_DATA_URI);
   Assert.equal(await getRootValue(ICON_URL), 1, "Check root == 1");
   Assert.equal(
     await getFaviconUrlForPage(pageURI1, 16),
@@ -222,13 +217,7 @@ add_task(async function test_root_on_different_host() {
   );
 
   // Same favicon for TEST_URL2.
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
-    iconURI,
-    SMALLPNG_DATA_URI.spec,
-    0,
-    systemPrincipal
-  );
-  await setFaviconForPage(pageURI2, iconURI);
+  await PlacesTestUtils.setFaviconForPage(pageURI2, iconURI, SMALLPNG_DATA_URI);
   Assert.equal(await getRootValue(ICON_URL), 1, "Check root == 1");
   Assert.equal(
     await getFaviconUrlForPage(pageURI2, 16),