diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/browser/browser_settitle.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/browser/browser_settitle.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,100 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+gBrowser.selectedTab = gBrowser.addTab();
+
+function finishAndCleanUp()
+{
+  gBrowser.removeCurrentTab();
+  promiseClearHistory().then(finish);
+}
+
+/**
+ * One-time DOMContentLoaded callback.
+ */
+function load(href, callback)
+{
+  content.location.href = href;
+  gBrowser.addEventListener("load", function() {
+    if (content.location.href == href) {
+      gBrowser.removeEventListener("load", arguments.callee, true);
+      if (callback)
+        callback();
+    }
+  }, true);
+}
+
+var conn = PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
+
+/**
+ * Gets a single column value from either the places or historyvisits table.
+ */
+function getColumn(table, column, fromColumnName, fromColumnValue)
+{
+  var stmt = conn.createStatement(
+    "SELECT " + column + " FROM " + table + " WHERE " + fromColumnName + "=:val " +
+    "LIMIT 1");
+  try {
+    stmt.params.val = fromColumnValue;
+    stmt.executeStep();
+    return stmt.row[column];
+  }
+  finally {
+    stmt.finalize();
+  }
+}
+
+function test()
+{
+  // Make sure titles are correctly saved for a URI with the proper
+  // notifications.
+
+  waitForExplicitFinish();
+
+  // Create and add history observer.
+  var historyObserver = {
+    data: [],
+    onBeginUpdateBatch: function() {},
+    onEndUpdateBatch: function() {},
+    onVisit: function(aURI, aVisitID, aTime, aSessionID, aReferringID,
+                      aTransitionType) {
+    },
+    onTitleChanged: function(aURI, aPageTitle, aGUID) {
+      this.data.push({ uri: aURI, title: aPageTitle, guid: aGUID });
+
+      // We only expect one title change.
+      //
+      // Although we are loading two different pages, the first page does not
+      // have a title.  Since the title starts out as empty and then is set
+      // to empty, there is no title change notification.
+
+      PlacesUtils.history.removeObserver(this);
+      confirmResults(this.data);
+    },
+    onDeleteURI: function() {},
+    onClearHistory: function() {},
+    onPageChanged: function() {},
+    onDeleteVisits: function() {},
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+  };
+  PlacesUtils.history.addObserver(historyObserver, false);
+
+  load("http://example.com/tests/toolkit/components/places/tests/browser/title1.html", function() {
+    load("http://example.com/tests/toolkit/components/places/tests/browser/title2.html");
+  });
+
+  function confirmResults(data) {
+    is(data[0].uri.spec, "http://example.com/tests/toolkit/components/places/tests/browser/title2.html");
+    is(data[0].title, "Some title");
+    is(data[0].guid, getColumn("moz_places", "guid", "url", data[0].uri.spec));
+
+    data.forEach(function(item) {
+      var title = getColumn("moz_places", "title", "url", data[0].uri.spec);
+      is(title, item.title);
+    });
+
+    finishAndCleanUp();
+  }
+}