diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/unit/test_history_catobs.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/unit/test_history_catobs.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,46 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+// Get services.
+let os = Cc["@mozilla.org/observer-service;1"].
+         getService(Ci.nsIObserverService);
+
+let gDummyCreated = false;
+let gDummyVisited = false;
+
+let observer = {
+  observe: function(subject, topic, data) {
+    if (topic == "dummy-observer-created")
+      gDummyCreated = true;
+    else if (topic == "dummy-observer-visited")
+      gDummyVisited = true;
+  },
+
+  QueryInterface: XPCOMUtils.generateQI([
+    Ci.nsIObserver,
+    Ci.nsISupportsWeakReference,
+  ])
+};
+
+function verify() {
+  do_check_true(gDummyCreated);
+  do_check_true(gDummyVisited);
+  do_test_finished();
+}
+
+// main
+function run_test() {
+  do_load_manifest("nsDummyObserver.manifest");
+
+  os.addObserver(observer, "dummy-observer-created", true);
+  os.addObserver(observer, "dummy-observer-visited", true);
+
+  do_test_pending();
+
+  // Add a visit
+  promiseAddVisits(uri("http://typed.mozilla.org")).then(
+            function () do_timeout(1000, verify));
+}