diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/browser/browser_visituri_nohistory.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/browser/browser_visituri_nohistory.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,65 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+const INITIAL_URL = "http://example.com/tests/toolkit/components/places/tests/browser/begin.html";
+const FINAL_URL = "http://example.com/tests/toolkit/components/places/tests/browser/final.html";
+
+let gTab = gBrowser.selectedTab = gBrowser.addTab();
+
+/**
+ * One-time observer callback.
+ */
+function waitForObserve(name, callback)
+{
+  let observer = {
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+    observe: function(subject, topic, data)
+    {
+      Services.obs.removeObserver(observer, name);
+      callback(subject, topic, data);
+    }
+  };
+
+  Services.obs.addObserver(observer, name, false);
+}
+
+/**
+ * One-time DOMContentLoaded callback.
+ */
+function waitForLoad(callback)
+{
+  gTab.linkedBrowser.addEventListener("load", function()
+  {
+    gTab.linkedBrowser.removeEventListener("load", arguments.callee, true);
+    callback();
+  }, true);
+}
+
+function test()
+{
+  waitForExplicitFinish();
+
+  Services.prefs.setBoolPref("places.history.enabled", false);
+
+  waitForObserve("uri-visit-saved", function(subject, topic, data)
+  {
+    let uri = subject.QueryInterface(Ci.nsIURI);
+    is(uri.spec, FINAL_URL, "received expected visit");
+    if (uri.spec != FINAL_URL)
+      return;
+    gBrowser.removeCurrentTab();
+    promiseClearHistory().then(finish);
+  });
+
+  Services.prefs.setBoolPref("places.history.enabled", false);
+  content.location.href = INITIAL_URL;
+  waitForLoad(function()
+  {
+    try {
+      Services.prefs.clearUserPref("places.history.enabled");
+    } catch(ex) {}    
+    content.location.href = FINAL_URL;
+  });
+}