Bug 1915774: Use PlacesTestUtils.setFaviconForPage() helper in places test r=places-reviewers,mak

Differential Revision: https://phabricator.services.mozilla.com/D241888

Author: Daisuke Akatsuka

toolkit/components/places/tests/PlacesTestUtils.sys.mjs

@@ -168,13 +168,9 @@ export var PlacesTestUtils = Object.freeze({
     isRichIcon = false
   ) {
     return lazy.PlacesUtils.favicons.setFaviconForPage(
-      pageURI instanceof Ci.nsIURI ? pageURI : Services.io.newURI(pageURI),
-      faviconURI instanceof Ci.nsIURI
-        ? faviconURI
-        : Services.io.newURI(faviconURI),
-      faviconDataURL instanceof Ci.nsIURI
-        ? faviconDataURL
-        : Services.io.newURI(faviconDataURL),
+      lazy.PlacesUtils.toURI(pageURI),
+      lazy.PlacesUtils.toURI(faviconURI),
+      lazy.PlacesUtils.toURI(faviconDataURL),
       expiration,
       isRichIcon
     );

toolkit/components/places/tests/bookmarks/test_async_observers.js

@@ -41,8 +41,8 @@ add_task(async function test_add_icon() {
       )
   );
 
-  PlacesUtils.favicons.setFaviconForPage(
-    NetUtil.newURI("http://book.ma.rk/"),
+  PlacesTestUtils.setFaviconForPage(
+    "http://book.ma.rk/",
     SMALLPNG_DATA_URI,
     SMALLPNG_DATA_URI
   );

toolkit/components/places/tests/chrome/test_cached_favicon.xhtml

@@ -104,10 +104,10 @@ function test()
     // icon with a page explicitly in order for it to be visible through
     // the protocol.
     info("Replace favicon data");
-    PlacesUtils.favicons.setFaviconForPage(
-      Services.io.newURI("https://example.com/favicon_annotations"),
-      Services.io.newURI(tests[1].url),
-      Services.io.newURI(tests[1].expectedIcon),
+    PlacesTestUtils.setFaviconForPage(
+      "https://example.com/favicon_annotations",
+      tests[1].url,
+      tests[1].expectedIcon,
       (Date.now() + 86400) * 1000,
     );
 

toolkit/components/places/tests/favicons/test_expire_migrated_icons.js

@@ -16,7 +16,7 @@ add_setup(() => {
 add_task(async function test_storing_a_normal_16x16_icon() {
   const PAGE_URL = Services.io.newURI("http://places.test");
   await PlacesTestUtils.addVisits(PAGE_URL);
-  await PlacesUtils.favicons.setFaviconForPage(
+  await PlacesTestUtils.setFaviconForPage(
     PAGE_URL,
     SMALLPNG_DATA_URI,
     SMALLPNG_DATA_URI
@@ -36,7 +36,7 @@ add_task(async function test_storing_a_normal_16x16_icon() {
   );
 
   info("Refresh favicon");
-  await PlacesUtils.favicons.setFaviconForPage(
+  await PlacesTestUtils.setFaviconForPage(
     PAGE_URL,
     SMALLPNG_DATA_URI,
     SMALLPNG_DATA_URI

toolkit/components/places/tests/favicons/test_query_result_favicon_changed_on_child.js

@@ -35,7 +35,7 @@ add_task(async function test_query_result_favicon_changed_on_child() {
         // favicon for the page must have data associated with it in order for
         // the icon changed notifications to be sent, so we use a valid image
         // data URI.
-        PlacesUtils.favicons.setFaviconForPage(
+        PlacesTestUtils.setFaviconForPage(
           PAGE_URI,
           SMALLPNG_DATA_URI,
           SMALLPNG_DATA_URI
@@ -107,7 +107,7 @@ add_task(
     );
 
     let promise = promiseFaviconChanged(PAGE_URI2, SMALLPNG_DATA_URI);
-    PlacesUtils.favicons.setFaviconForPage(
+    PlacesTestUtils.setFaviconForPage(
       PAGE_URI2,
       SMALLPNG_DATA_URI,
       SMALLPNG_DATA_URI

toolkit/components/places/tests/maintenance/test_preventive_maintenance.js

@@ -2610,7 +2610,7 @@ tests.push({
     });
 
     PlacesUtils.tagging.tagURI(this._uri1, ["testtag"]);
-    await PlacesUtils.favicons.setFaviconForPage(
+    await PlacesTestUtils.setFaviconForPage(
       this._uri2,
       SMALLPNG_DATA_URI,
       SMALLPNG_DATA_URI

widget/tests/unit/test_JumpListBuilder_obtainAndCacheFaviconAsync.js

@@ -6,9 +6,6 @@ https://creativecommons.org/publicdomain/zero/1.0/ */
 const { AppConstants } = ChromeUtils.importESModule(
   "resource://gre/modules/AppConstants.sys.mjs"
 );
-const { PlacesUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/PlacesUtils.sys.mjs"
-);
 const { PlacesTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/PlacesTestUtils.sys.mjs"
 );
@@ -68,10 +65,10 @@ add_setup(async () => {
     reader.readAsDataURL(blob);
   });
 
-  await PlacesUtils.favicons.setFaviconForPage(
+  await PlacesTestUtils.setFaviconForPage(
     TEST_PAGE_URI,
     TEST_FAVICON_URI,
-    Services.io.newURI(dataURL)
+    dataURL
   );
 });