1 files changed, 139 insertions, 0 deletions
diff --git a/comm/suite/components/tests/browser/browser_490040.js b/comm/suite/components/tests/browser/browser_490040.js
new file mode 100644
index 0000000000..91687058f6
--- /dev/null
+++ b/comm/suite/components/tests/browser/browser_490040.js
@@ -0,0 +1,139 @@
+/* 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/. */
+
+var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+function browserWindowsCount() {
+  let count = 0;
+  let e = Services.wm.getEnumerator("navigator:browser");
+  while (e.hasMoreElements()) {
+    if (!e.getNext().closed)
+      ++count;
+  }
+  return count;
+}
+
+function test() {
+  /** Test for Bug 490040, ported by Bug 511640 **/
+  is(browserWindowsCount(), 1, "Only one browser window should be open initially");
+
+  waitForExplicitFinish();
+
+  function testWithState(aState) {
+    // Ensure we can store the window if needed.
+    let curClosedWindowCount = ss.getClosedWindowCount();
+    Services.prefs.setIntPref("browser.sessionstore.max_windows_undo",
+                              curClosedWindowCount + 1);
+
+    var origWin;
+    function windowObserver(aSubject, aTopic, aData) {
+      let theWin = aSubject.QueryInterface(Ci.nsIDOMWindow);
+      if (origWin && theWin != origWin)
+        return;
+
+      switch (aTopic) {
+        case "domwindowopened":
+          origWin = theWin;
+          theWin.addEventListener("load", function testTheWinLoad() {
+            theWin.removeEventListener("load", testTheWinLoad);
+            executeSoon(function () {
+              // Close the window as soon as the first tab loads, or
+              // immediately if there are no tabs.
+              if (aState.windowState.windows[0].tabs[0].entries.length) {
+                theWin.gBrowser.addEventListener("load",
+                                                   function testTheWinLoad2() {
+                  theWin.gBrowser.removeEventListener("load", testTheWinLoad2,
+                                                        true);
+                  theWin.close();
+                }, true);
+              } else {
+                executeSoon(function () {
+                  theWin.close();
+                });
+              }
+              ss.setWindowState(theWin, JSON.stringify(aState.windowState),
+                                true);
+            });
+          });
+          break;
+
+        case "domwindowclosed":
+          Services.ww.unregisterNotification(windowObserver);
+          // Use executeSoon to ensure this happens after SS observer.
+          executeSoon(function () {
+            is(ss.getClosedWindowCount(),
+               curClosedWindowCount + (aState.shouldBeAdded ? 1 : 0),
+               "That window should " + (aState.shouldBeAdded ? "" : "not ") +
+               "be restorable");
+            executeSoon(runNextTest);
+          });
+          break;
+      }
+    }
+    Services.ww.registerNotification(windowObserver);
+    Services.ww.openWindow(null,
+                           location,
+                           "_blank",
+                           "chrome,all,dialog=no",
+                           null);
+  }
+
+  // Only windows with open tabs are restorable. Windows where a lone tab is
+  // detached may have _closedTabs, but is left with just an empty tab.
+  let states = [
+    {
+      shouldBeAdded: true,
+      windowState: {
+        windows: [{
+          tabs: [{ entries: [{ url: "http://example.com", title: "example.com" }] }],
+          selected: 1,
+          _closedTabs: []
+        }]
+      }
+    },
+    {
+      shouldBeAdded: false,
+      windowState: {
+        windows: [{
+          tabs: [{ entries: [] }],
+          _closedTabs: []
+        }]
+      }
+    },
+    {
+      shouldBeAdded: false,
+      windowState: {
+        windows: [{
+          tabs: [{ entries: [] }],
+          _closedTabs: [{ state: { entries: [{ url: "http://example.com", index: 1 }] } }]
+        }]
+      }
+    },
+    {
+      shouldBeAdded: false,
+      windowState: {
+        windows: [{
+          tabs: [{ entries: [] }],
+          _closedTabs: [],
+          extData: { keyname: "pi != " + Math.random() }
+        }]
+      }
+    }
+  ];
+
+  function runNextTest() {
+    if (states.length) {
+      let state = states.shift();
+      testWithState(state);
+    }
+    else {
+      if (Services.prefs.prefHasUserValue("browser.sessionstore.max_windows_undo"))
+        Services.prefs.clearUserPref("browser.sessionstore.max_windows_undo");
+      is(browserWindowsCount(), 1, "Only one browser window should be open eventually");
+      finish();
+    }
+  }
+  runNextTest();
+}
+