1 files changed, 7 insertions, 37 deletions
diff --git a/toolkit/components/places/tests/favicons/test_page-icon_protocol.js b/toolkit/components/places/tests/favicons/test_page-icon_protocol.js
index 287484868f..2241dec990 100644
--- a/toolkit/components/places/tests/favicons/test_page-icon_protocol.js
+++ b/toolkit/components/places/tests/favicons/test_page-icon_protocol.js
@@ -76,25 +76,12 @@ var gFavicon;
 
 add_task(async function setup() {
   await PlacesTestUtils.addVisits(TEST_URI);
-
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.setFaviconForPage(
+    TEST_URI,
     ICON_URI,
     ICON_DATAURL,
-    (Date.now() + 8640000) * 1000,
-    Services.scriptSecurityManager.getSystemPrincipal()
+    (Date.now() + 8640000) * 1000
   );
-
-  await new Promise(resolve => {
-    PlacesUtils.favicons.setAndFetchFaviconForPage(
-      TEST_URI,
-      ICON_URI,
-      false,
-      PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
-      resolve,
-      Services.scriptSecurityManager.getSystemPrincipal()
-    );
-  });
-
   gDefaultFavicon = await fetchIconForSpec(
     PlacesUtils.favicons.defaultFavicon.spec
   );
@@ -133,13 +120,11 @@ add_task(async function subpage_url_fallback() {
 
 add_task(async function svg_icon() {
   let faviconURI = NetUtil.newURI("http://places.test/favicon.svg");
-  PlacesUtils.favicons.replaceFaviconDataFromDataURL(
+  await PlacesTestUtils.setFaviconForPage(
+    TEST_URI,
     faviconURI,
-    SMALLSVG_DATA_URI.spec,
-    0,
-    Services.scriptSecurityManager.getSystemPrincipal()
+    SMALLSVG_DATA_URI
   );
-  await setFaviconForPage(TEST_URI, faviconURI);
   let svgIcon = await fetchIconForSpec(SMALLSVG_DATA_URI.spec);
   info(svgIcon.contentType);
   let pageIcon = await fetchIconForSpec("page-icon:" + TEST_URI.spec);
@@ -270,23 +255,8 @@ add_task(async function test_with_user_pass() {
 
   for (const { pageURI, iconURI } of testData) {
     for (const loadingIconURISpec of [PAGE_ICON_NORMAL, PAGE_ICON_USERPASS]) {
-      PlacesUtils.favicons.replaceFaviconDataFromDataURL(
-        iconURI,
-        ICON_DATAURL,
-        0,
-        systemPrincipal
-      );
       await PlacesTestUtils.addVisits(pageURI);
-      await new Promise(resolve => {
-        PlacesUtils.favicons.setAndFetchFaviconForPage(
-          pageURI,
-          iconURI,
-          false,
-          PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
-          resolve,
-          Services.scriptSecurityManager.getSystemPrincipal()
-        );
-      });
+      await PlacesTestUtils.setFaviconForPage(pageURI, iconURI, ICON_DATAURL);
 
       let { data, contentType } = await fetchIconForSpec(loadingIconURISpec);
       Assert.equal(contentType, gFavicon.contentType);