diff -r 000000000000 -r 6474c204b198 browser/components/sessionstore/test/browser_pageStyle.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/sessionstore/test/browser_pageStyle.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,88 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const URL = getRootDirectory(gTestPath) + "browser_pageStyle_sample.html";
+const URL_NESTED = getRootDirectory(gTestPath) + "browser_pageStyle_sample_nested.html";
+
+/**
+ * This test ensures that page style information is correctly persisted.
+ */
+add_task(function page_style() {
+  let tab = gBrowser.addTab(URL);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+  let sheets = yield getStyleSheets(browser);
+
+  // Enable all style sheets one by one.
+  for (let [title, disabled] of sheets) {
+    yield enableStyleSheetsForSet(browser, title);
+
+    let tab2 = gBrowser.duplicateTab(tab);
+    yield promiseTabRestored(tab2);
+
+    let sheets = yield getStyleSheets(tab2.linkedBrowser);
+    let enabled = sheets.filter(([title, disabled]) => !disabled);
+
+    if (title.startsWith("fail_")) {
+      ok(!enabled.length, "didn't restore " + title);
+    } else {
+      ok(enabled.length == 1 && enabled[0][0] == title, "restored " + title);
+    }
+
+    gBrowser.removeTab(tab2);
+  }
+
+  // Disable all styles and verify that this is correctly persisted.
+  yield setAuthorStyleDisabled(browser, true);
+
+  let tab2 = gBrowser.duplicateTab(tab);
+  yield promiseTabRestored(tab2);
+
+  let authorStyleDisabled = yield getAuthorStyleDisabled(tab2.linkedBrowser);
+  ok(authorStyleDisabled, "disabled all stylesheets");
+
+  // Clean up.
+  gBrowser.removeTab(tab);
+  gBrowser.removeTab(tab2);
+});
+
+/**
+ * This test ensures that page style notification from nested documents are
+ * received and the page style is persisted correctly.
+ */
+add_task(function nested_page_style() {
+  let tab = gBrowser.addTab(URL_NESTED);
+  let browser = tab.linkedBrowser;
+  yield promiseBrowserLoaded(browser);
+
+  yield enableSubDocumentStyleSheetsForSet(browser, "alternate");
+  gBrowser.removeTab(tab);
+
+  let [{state: {pageStyle}}] = JSON.parse(ss.getClosedTabData(window));
+  let expected = JSON.stringify({children: [{pageStyle: "alternate"}]});
+  is(JSON.stringify(pageStyle), expected, "correct pageStyle persisted");
+});
+
+function getStyleSheets(browser) {
+  return sendMessage(browser, "ss-test:getStyleSheets");
+}
+
+function enableStyleSheetsForSet(browser, name) {
+  return sendMessage(browser, "ss-test:enableStyleSheetsForSet", name);
+}
+
+function enableSubDocumentStyleSheetsForSet(browser, name) {
+  return sendMessage(browser, "ss-test:enableSubDocumentStyleSheetsForSet", {
+    id: "iframe", set: name
+  });
+}
+
+function getAuthorStyleDisabled(browser) {
+  return sendMessage(browser, "ss-test:getAuthorStyleDisabled");
+}
+
+function setAuthorStyleDisabled(browser, val) {
+  return sendMessage(browser, "ss-test:setAuthorStyleDisabled", val)
+}