diff -r 000000000000 -r 6474c204b198 browser/base/content/test/general/browser_URLBarSetURI.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/base/content/test/general/browser_URLBarSetURI.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,82 @@
+/* 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/. */
+
+function test() {
+  waitForExplicitFinish();
+
+  // avoid prompting about phishing
+  Services.prefs.setIntPref(phishyUserPassPref, 32);
+  registerCleanupFunction(function () {
+    Services.prefs.clearUserPref(phishyUserPassPref);
+  });
+
+  nextTest();
+}
+
+const phishyUserPassPref = "network.http.phishy-userpass-length";
+
+function nextTest() {
+  let test = tests.shift();
+  if (test) {
+    test(function () {
+      executeSoon(nextTest);
+    });
+  } else {
+    executeSoon(finish);
+  }
+}
+
+let tests = [
+  function revert(next) {
+    loadTabInWindow(window, function (tab) {
+      gURLBar.handleRevert();
+      is(gURLBar.value, "example.com", "URL bar had user/pass stripped after reverting");
+      gBrowser.removeTab(tab);
+      next();
+    });
+  },
+  function customize(next) {
+    whenNewWindowLoaded(undefined, function (win) {
+      // Need to wait for delayedStartup for the customization part of the test,
+      // since that's where BrowserToolboxCustomizeDone is set.
+      whenDelayedStartupFinished(win, function () {
+        loadTabInWindow(win, function () {
+          openToolbarCustomizationUI(function () {
+            closeToolbarCustomizationUI(function () {
+              is(win.gURLBar.value, "example.com", "URL bar had user/pass stripped after customize");
+              win.close();
+              next();
+            }, win);
+          }, win);
+        });
+      });
+    });
+  },
+  function pageloaderror(next) {
+    loadTabInWindow(window, function (tab) {
+      // Load a new URL and then immediately stop it, to simulate a page load
+      // error.
+      tab.linkedBrowser.loadURI("http://test1.example.com");
+      tab.linkedBrowser.stop();
+      is(gURLBar.value, "example.com", "URL bar had user/pass stripped after load error");
+      gBrowser.removeTab(tab);
+      next();
+    });
+  }
+];
+
+function loadTabInWindow(win, callback) {
+  info("Loading tab");
+  let url = "http://user:pass@example.com/";
+  let tab = win.gBrowser.selectedTab = win.gBrowser.addTab(url);
+  tab.linkedBrowser.addEventListener("load", function listener() {
+    info("Tab loaded");
+    if (tab.linkedBrowser.currentURI.spec != url)
+      return;
+    tab.linkedBrowser.removeEventListener("load", listener, true);
+
+    is(win.gURLBar.value, "example.com", "URL bar had user/pass stripped initially");
+    callback(tab);
+  }, true);
+}