Bug 1143740 - Re-enable browser_491168.js r=smacleod

browser/components/sessionstore/test/browser.ini

@@ -135,9 +135,6 @@ skip-if = true
 [browser_485563.js]
 [browser_490040.js]
 [browser_491168.js]
-# Disabled for too many intermittent failures.
-# Can be re-enabled once bug 930202 lands.
-skip-if = true
 [browser_491577.js]
 [browser_495495.js]
 [browser_500328.js]

browser/components/sessionstore/test/browser_491168.js

@@ -1,41 +1,42 @@
-/* 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/. */
+"use strict";
 
-function test() {
-  /** Test for Bug 491168 **/
-
-  waitForExplicitFinish();
-
-  const REFERRER1 = "http://example.org/?" + Date.now();
-  const REFERRER2 = "http://example.org/?" + Math.random();
-
-  let tab = gBrowser.addTab();
-  gBrowser.selectedTab = tab;
+const REFERRER1 = "http://example.org/?" + Date.now();
+const REFERRER2 = "http://example.org/?" + Math.random();
 
+add_task(function* () {
+  // Add a new tab.
+  let tab = gBrowser.selectedTab = gBrowser.addTab("about:blank");
   let browser = tab.linkedBrowser;
-  promiseBrowserLoaded(browser).then(() => {
-    let tabState = JSON.parse(ss.getTabState(tab));
-    is(tabState.entries[0].referrer,  REFERRER1,
-       "Referrer retrieved via getTabState matches referrer set via loadURI.");
-
-    tabState.entries[0].referrer = REFERRER2;
-
-    promiseTabState(tab, tabState).then(() => {
-      is(window.content.document.referrer, REFERRER2, "document.referrer matches referrer set via setTabState.");
-
-      gBrowser.removeTab(tab);
-
-      let newTab = ss.undoCloseTab(window, 0);
-      promiseTabRestored(newTab).then(() => {
-        is(window.content.document.referrer, REFERRER2, "document.referrer is still correct after closing and reopening the tab.");
-        gBrowser.removeTab(newTab);
-
-        finish();
-      });
-    });
-  });
+  yield promiseBrowserLoaded(browser);
 
+  // Load a new URI with a specific referrer.
   let referrerURI = Services.io.newURI(REFERRER1, null, null);
   browser.loadURI("http://example.org", referrerURI, null);
+  yield promiseBrowserLoaded(browser);
+
+  TabState.flush(browser);
+  let tabState = JSON.parse(ss.getTabState(tab));
+  is(tabState.entries[0].referrer,  REFERRER1,
+     "Referrer retrieved via getTabState matches referrer set via loadURI.");
+
+  tabState.entries[0].referrer = REFERRER2;
+  yield promiseTabState(tab, tabState);
+
+  is((yield promiseDocumentReferrer()), REFERRER2,
+     "document.referrer matches referrer set via setTabState.");
+  gBrowser.removeCurrentTab();
+
+  // Restore the closed tab.
+  tab = ss.undoCloseTab(window, 0);
+  yield promiseTabRestored(tab);
+
+  is((yield promiseDocumentReferrer()), REFERRER2,
+     "document.referrer is still correct after closing and reopening the tab.");
+  gBrowser.removeCurrentTab();
+});
+
+function promiseDocumentReferrer() {
+  return ContentTask.spawn(gBrowser.selectedBrowser, null, function* () {
+    return content.document.referrer;
+  });
 }