diff -r 000000000000 -r 6474c204b198 toolkit/components/passwordmgr/test/browser/browser_passwordmgr_observers.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/passwordmgr/test/browser/browser_passwordmgr_observers.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,154 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  waitForExplicitFinish();
+
+  const LOGIN_HOST = "http://example.com";
+  const LOGIN_COUNT = 5;
+
+  let nsLoginInfo = new Components.Constructor(
+    "@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo, "init");
+  let pmDialog = window.openDialog(
+    "chrome://passwordmgr/content/passwordManager.xul",
+    "Toolkit:PasswordManager", "");
+  let pmexDialog = window.openDialog(
+    "chrome://passwordmgr/content/passwordManagerExceptions.xul",
+    "Toolkit:PasswordManagerExceptions", "");
+  let logins = [];
+  let loginCounter = 0;
+  let loginOrder = null;
+  let modifiedLogin;
+  let testNumber = 0;
+  let testObserver = {
+    observe: function (subject, topic, data) {
+      if (topic == "passwordmgr-dialog-updated") {
+        switch (testNumber) {
+          case 1:
+          case 2:
+          case 3:
+          case 4:
+          case 5:
+            is(countLogins(), loginCounter, "Verify login added");
+            ok(getLoginOrder().startsWith(loginOrder), "Verify login order");
+            runNextTest();
+            break;
+          case 6:
+            is(countLogins(), loginCounter, "Verify login count");
+            is(getLoginOrder(), loginOrder, "Verify login order");
+            is(getLoginPassword(), "newpassword0", "Verify login modified");
+            runNextTest();
+            break;
+          case 7:
+            is(countLogins(), loginCounter, "Verify login removed");
+            ok(loginOrder.endsWith(getLoginOrder()), "Verify login order");
+            runNextTest();
+            break;
+          case 8:
+            is(countLogins(), 0, "Verify all logins removed");
+            runNextTest();
+            break;
+          case 9:
+            is(countDisabledHosts(), 1, "Verify disabled host added");
+            runNextTest();
+            break;
+          case 10:
+            is(countDisabledHosts(), 0, "Verify disabled host removed");
+            runNextTest();
+            break;
+        }
+      }
+    }
+  };
+
+  SimpleTest.waitForFocus(startTest, pmDialog);
+
+  function createLogins() {
+    let login;
+    for (let i = 0; i < LOGIN_COUNT; i++) {
+      login = new nsLoginInfo(LOGIN_HOST + "?n=" + i, LOGIN_HOST + "?n=" + i,
+        null, "user" + i, "password" + i, "u" + i, "p" + i);
+      logins.push(login);
+    }
+    modifiedLogin = new nsLoginInfo(LOGIN_HOST + "?n=0", LOGIN_HOST + "?n=0",
+      null, "user0", "newpassword0", "u0", "p0");
+    is(logins.length, LOGIN_COUNT, "Verify logins created");
+  }
+
+  function countDisabledHosts() {
+    let doc = pmexDialog.document;
+    let rejectsTree = doc.getElementById("rejectsTree");
+    return rejectsTree.view.rowCount;
+  }
+
+  function countLogins() {
+    let doc = pmDialog.document;
+    let signonsTree = doc.getElementById("signonsTree");
+    return signonsTree.view.rowCount;
+  }
+
+  function getLoginOrder() {
+    let doc = pmDialog.document;
+    let signonsTree = doc.getElementById("signonsTree");
+    let column = signonsTree.columns[0]; // host column
+    let order = [];
+    for (let i = 0; i < signonsTree.view.rowCount; i++) {
+      order.push(signonsTree.view.getCellText(i, column));
+    }
+    return order.join(',');
+  }
+
+  function getLoginPassword() {
+    let doc = pmDialog.document;
+    let loginsTree = doc.getElementById("signonsTree");
+    let column = loginsTree.columns[2]; // password column
+    return loginsTree.view.getCellText(0, column);
+  }
+
+  function startTest() {
+    Services.obs.addObserver(
+      testObserver, "passwordmgr-dialog-updated", false);
+    is(countLogins(), 0, "Verify starts with 0 logins");
+    createLogins();
+    runNextTest();
+  }
+
+  function runNextTest() {
+    switch (++testNumber) {
+      case 1: // add the logins
+        for (let i = 0; i < logins.length; i++) {
+          loginCounter++;
+          loginOrder = getLoginOrder();
+          Services.logins.addLogin(logins[i]);
+        }
+        break;
+      case 6: // modify a login
+        loginOrder = getLoginOrder();
+        Services.logins.modifyLogin(logins[0], modifiedLogin);
+        break;
+      case 7: // remove a login
+        loginCounter--;
+        loginOrder = getLoginOrder();
+        Services.logins.removeLogin(modifiedLogin);
+        break;
+      case 8: // remove all logins
+        Services.logins.removeAllLogins();
+        break;
+      case 9: // save a disabled host
+        pmDialog.close();
+        SimpleTest.waitForFocus(function() {
+          Services.logins.setLoginSavingEnabled(LOGIN_HOST, false);
+        }, pmexDialog);
+        break;
+      case 10: // remove a disabled host
+        Services.logins.setLoginSavingEnabled(LOGIN_HOST, true);
+        break;
+      case 11: // finish
+        Services.obs.removeObserver(
+          testObserver, "passwordmgr-dialog-updated", false);
+        pmexDialog.close();
+        finish();
+        break;
+    }
+  }
+}