diff -r 000000000000 -r 6474c204b198 browser/components/sessionstore/test/browser_495495.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/sessionstore/test/browser_495495.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,54 @@
+/* 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() {
+  /** Test for Bug 495495 **/
+
+  waitForExplicitFinish();
+
+  let newWin = openDialog(location, "_blank", "chrome,all,dialog=no,toolbar=yes");
+  newWin.addEventListener("load", function() {
+    newWin.removeEventListener("load", arguments.callee, false);
+
+    executeSoon(function() {
+      let state1 = ss.getWindowState(newWin);
+      newWin.close();
+
+      newWin = openDialog(location, "_blank",
+        "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar=no,location,personal,directories,dialog=no");
+      newWin.addEventListener("load", function() {
+        newWin.removeEventListener("load", arguments.callee, false);
+
+        executeSoon(function() {
+          let state2 = ss.getWindowState(newWin);
+          newWin.close();
+
+          function testState(state, expected, callback) {
+            let win = openDialog(location, "_blank", "chrome,all,dialog=no");
+            win.addEventListener("load", function() {
+              win.removeEventListener("load", arguments.callee, false);
+
+              is(win.gURLBar.readOnly, false,
+                 "URL bar should not be read-only before setting the state");
+              is(win.gURLBar.getAttribute("enablehistory"), "true",
+                 "URL bar autocomplete should be enabled before setting the state");
+              ss.setWindowState(win, state, true);
+              is(win.gURLBar.readOnly, expected.readOnly,
+                 "URL bar read-only state should be restored correctly");
+              is(win.gURLBar.getAttribute("enablehistory"), expected.enablehistory,
+                 "URL bar autocomplete state should be restored correctly");
+
+              win.close();
+              executeSoon(callback);
+            }, false);
+          }
+
+          testState(state1, {readOnly: false, enablehistory: "true"}, function() {
+            testState(state2, {readOnly: true, enablehistory: "false"}, finish);
+          });
+        });
+      }, false);
+    });
+  }, false);
+}