diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/expiration/test_debug_expiration.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/expiration/test_debug_expiration.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,111 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * What this is aimed to test:
+ *
+ * Expiration can be manually triggered through a debug topic, but that should
+ * only expire orphan entries, unless -1 is passed as limit.
+ */
+
+let gNow = getExpirablePRTime();
+
+add_task(function test_expire_orphans()
+{
+  // Add visits to 2 pages and force a orphan expiration. Visits should survive.
+  yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
+                           visitDate: gNow++ });
+  yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
+                           visitDate: gNow++ });
+  // Create a orphan place.
+  let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                                NetUtil.newURI("http://page3.mozilla.org/"),
+                                                PlacesUtils.bookmarks.DEFAULT_INDEX, "");
+  PlacesUtils.bookmarks.removeItem(id);
+
+  // Expire now.
+  yield promiseForceExpirationStep(0);
+
+  // Check that visits survived.
+  do_check_eq(visits_in_database("http://page1.mozilla.org/"), 1);
+  do_check_eq(visits_in_database("http://page2.mozilla.org/"), 1);
+  do_check_false(page_in_database("http://page3.mozilla.org/"));
+
+  // Clean up.
+  yield promiseClearHistory();
+});
+
+add_task(function test_expire_orphans_optionalarg()
+{
+  // Add visits to 2 pages and force a orphan expiration. Visits should survive.
+  yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
+                           visitDate: gNow++ });
+  yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
+                           visitDate: gNow++ });
+  // Create a orphan place.
+  let id = PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
+                                                NetUtil.newURI("http://page3.mozilla.org/"),
+                                                PlacesUtils.bookmarks.DEFAULT_INDEX, "");
+  PlacesUtils.bookmarks.removeItem(id);
+
+  // Expire now.
+  yield promiseForceExpirationStep();
+
+  // Check that visits survived.
+  do_check_eq(visits_in_database("http://page1.mozilla.org/"), 1);
+  do_check_eq(visits_in_database("http://page2.mozilla.org/"), 1);
+  do_check_false(page_in_database("http://page3.mozilla.org/"));
+
+  // Clean up.
+  yield promiseClearHistory();
+});
+
+add_task(function test_expire_limited()
+{
+  // Add visits to 2 pages and force a single expiration.
+  // Only 1 page should survive.
+  yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
+                           visitDate: gNow++ });
+  yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
+                           visitDate: gNow++ });
+
+  // Expire now.
+  yield promiseForceExpirationStep(1);
+
+  // Check that visits to the more recent page survived.
+  do_check_false(page_in_database("http://page1.mozilla.org/"));
+  do_check_eq(visits_in_database("http://page2.mozilla.org/"), 1);
+
+  // Clean up.
+  yield promiseClearHistory();
+});
+
+add_task(function test_expire_unlimited()
+{
+  // Add visits to 2 pages and force a single expiration.
+  // Only 1 page should survive.
+  yield promiseAddVisits({ uri: uri("http://page1.mozilla.org/"),
+                           visitDate: gNow++ });
+  yield promiseAddVisits({ uri: uri("http://page2.mozilla.org/"),
+                           visitDate: gNow++ });
+
+  // Expire now.
+  yield promiseForceExpirationStep(-1);
+
+  // Check that visits to the more recent page survived.
+  do_check_false(page_in_database("http://page1.mozilla.org/"));
+  do_check_false(page_in_database("http://page2.mozilla.org/"));
+
+  // Clean up.
+  yield promiseClearHistory();
+});
+
+function run_test()
+{
+  // Set interval to a large value so we don't expire on it.
+  setInterval(3600); // 1h
+  // Set maxPages to a low value, so it's easy to go over it.
+  setMaxPages(1);
+
+  run_next_test();
+}