diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/favicons/test_expireAllFavicons.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/favicons/test_expireAllFavicons.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,54 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * This file tests that favicons are correctly expired by expireAllFavicons.
+ */
+
+////////////////////////////////////////////////////////////////////////////////
+/// Globals
+
+const TEST_PAGE_URI = NetUtil.newURI("http://example.com/");
+const BOOKMARKED_PAGE_URI = NetUtil.newURI("http://example.com/bookmarked");
+
+////////////////////////////////////////////////////////////////////////////////
+/// Tests
+
+function run_test() {
+  run_next_test();
+}
+
+add_test(function test_expireAllFavicons() {
+  // Set up an observer to wait for favicons expiration to finish.
+  Services.obs.addObserver(function EAF_observer(aSubject, aTopic, aData) {
+    Services.obs.removeObserver(EAF_observer, aTopic);
+
+    // Check that the favicons for the pages we added were removed.
+    checkFaviconMissingForPage(TEST_PAGE_URI, function () {
+      checkFaviconMissingForPage(BOOKMARKED_PAGE_URI, function () {
+        run_next_test();
+      });
+    });
+  }, PlacesUtils.TOPIC_FAVICONS_EXPIRED, false);
+
+  // Add a visited page.
+  promiseAddVisits({ uri: TEST_PAGE_URI, transition: TRANSITION_TYPED }).then(
+    function () {
+      PlacesUtils.favicons.setAndFetchFaviconForPage(TEST_PAGE_URI,
+                                                     SMALLPNG_DATA_URI, true,
+                                                     PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE);
+
+      // Add a page with a bookmark.
+      PlacesUtils.bookmarks.insertBookmark(
+                            PlacesUtils.toolbarFolderId, BOOKMARKED_PAGE_URI,
+                            PlacesUtils.bookmarks.DEFAULT_INDEX,
+                            "Test bookmark");
+      PlacesUtils.favicons.setAndFetchFaviconForPage(
+        BOOKMARKED_PAGE_URI, SMALLPNG_DATA_URI, true,
+          PlacesUtils.favicons.FAVICON_LOAD_NON_PRIVATE,
+          function () {
+            // Start expiration only after data has been saved in the database.
+            PlacesUtils.favicons.expireAllFavicons();
+          });
+    });
+});