diff -r 000000000000 -r 6474c204b198 browser/components/sessionstore/test/browser_350525.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/sessionstore/test/browser_350525.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,99 @@
+function test() {
+  /** Test for Bug 350525 **/
+
+  function test(aLambda) {
+    try {
+      return aLambda() || true;
+    }
+    catch (ex) { }
+    return false;
+  }
+
+  waitForExplicitFinish();
+
+  ////////////////////////////
+  // setWindowValue, et al. //
+  ////////////////////////////
+  let key = "Unique name: " + Date.now();
+  let value = "Unique value: " + Math.random();
+
+  // test adding
+  ok(test(function() ss.setWindowValue(window, key, value)), "set a window value");
+
+  // test retrieving
+  is(ss.getWindowValue(window, key), value, "stored window value matches original");
+
+  // test deleting
+  ok(test(function() ss.deleteWindowValue(window, key)), "delete the window value");
+
+  // value should not exist post-delete
+  is(ss.getWindowValue(window, key), "", "window value was deleted");
+
+  // test deleting a non-existent value
+  ok(test(function() ss.deleteWindowValue(window, key)), "delete non-existent window value");
+
+  /////////////////////////
+  // setTabValue, et al. //
+  /////////////////////////
+  key = "Unique name: " + Math.random();
+  value = "Unique value: " + Date.now();
+  let tab = gBrowser.addTab();
+  tab.linkedBrowser.stop();
+
+  // test adding
+  ok(test(function() ss.setTabValue(tab, key, value)), "store a tab value");
+
+  // test retrieving
+  is(ss.getTabValue(tab, key), value, "stored tab value match original");
+
+  // test deleting
+  ok(test(function() ss.deleteTabValue(tab, key)), "delete the tab value");
+
+  // value should not exist post-delete
+  is(ss.getTabValue(tab, key), "", "tab value was deleted");
+
+  // test deleting a non-existent value
+  ok(test(function() ss.deleteTabValue(tab, key)), "delete non-existent tab value");
+
+  // clean up
+  gBrowser.removeTab(tab);
+
+  /////////////////////////////////////
+  // getClosedTabCount, undoCloseTab //
+  /////////////////////////////////////
+
+  // get closed tab count
+  let count = ss.getClosedTabCount(window);
+  let max_tabs_undo = gPrefService.getIntPref("browser.sessionstore.max_tabs_undo");
+  ok(0 <= count && count <= max_tabs_undo,
+     "getClosedTabCount returns zero or at most max_tabs_undo");
+
+  // create a new tab
+  let testURL = "about:";
+  tab = gBrowser.addTab(testURL);
+  whenBrowserLoaded(tab.linkedBrowser, function() {
+    // make sure that the next closed tab will increase getClosedTabCount
+    gPrefService.setIntPref("browser.sessionstore.max_tabs_undo", max_tabs_undo + 1);
+
+    // remove tab
+    gBrowser.removeTab(tab);
+
+    // getClosedTabCount
+    var newcount = ss.getClosedTabCount(window);
+    ok(newcount > count, "after closing a tab, getClosedTabCount has been incremented");
+
+    // undoCloseTab
+    tab = test(function() ss.undoCloseTab(window, 0));
+    ok(tab, "undoCloseTab doesn't throw")
+
+    whenTabRestored(tab, function() {
+      is(tab.linkedBrowser.currentURI.spec, testURL, "correct tab was reopened");
+
+      // clean up
+      if (gPrefService.prefHasUserValue("browser.sessionstore.max_tabs_undo"))
+        gPrefService.clearUserPref("browser.sessionstore.max_tabs_undo");
+      gBrowser.removeTab(tab);
+      finish();
+    });
+  });
+}