Bug 1240014, enable test browser_newtab_bug1194895 in e10s, r=adw

browser/base/content/test/newtab/browser_newtab_bug1194895.js

@@ -25,59 +25,60 @@ gDirectorySource = "data:application/json," + JSON.stringify({
 });
 
 
-function runTests() {
+add_task(function* () {
   requestLongerTimeout(4);
   let origEnhanced = NewTabUtils.allPages.enhanced;
   let origCompareLinks = NewTabUtils.links.compareLinks;
   registerCleanupFunction(() => {
-    Services.prefs.clearUserPref(PRELOAD_PREF);
-    Services.prefs.clearUserPref(PREF_NEWTAB_ROWS);
-    Services.prefs.clearUserPref(PREF_NEWTAB_COLUMNS);
     NewTabUtils.allPages.enhanced = origEnhanced;
     NewTabUtils.links.compareLinks = origCompareLinks;
   });
 
   // turn off preload to ensure grid updates on every setLinks
-  Services.prefs.setBoolPref(PRELOAD_PREF, false);
+  yield pushPrefs([PRELOAD_PREF, false]);
   // set newtab to have three columns only
-  Services.prefs.setIntPref(PREF_NEWTAB_COLUMNS, 3);
-  Services.prefs.setIntPref(PREF_NEWTAB_ROWS, 5);
+  yield pushPrefs([PREF_NEWTAB_COLUMNS, 3]);
+  yield pushPrefs([PREF_NEWTAB_ROWS, 5]);
 
-  yield addNewTabPageTab();
+  yield* addNewTabPageTab();
   yield customizeNewTabPage("enhanced"); // Toggle enhanced off
 
   // Testing history tiles
 
   // two rows of tiles should always fit on any screen
   yield setLinks("0,1,2,3,4,5");
-  yield addNewTabPageTab();
+  yield* addNewTabPageTab();
 
   // should do not see scrollbar since tiles fit into visible space
-  checkGrid("0,1,2,3,4,5");
-  ok(!hasScrollbar(), "no scrollbar");
+  yield* checkGrid("0,1,2,3,4,5");
+  let scrolling = yield hasScrollbar();
+  ok(!scrolling, "no scrollbar");
 
   // add enough tiles to cause extra two rows and observe scrollbar
   yield setLinks("0,1,2,3,4,5,6,7,8,9");
-  yield addNewTabPageTab();
-  checkGrid("0,1,2,3,4,5,6,7,8,9");
-  ok(hasScrollbar(), "document has scrollbar");
+  yield* addNewTabPageTab();
+  yield* checkGrid("0,1,2,3,4,5,6,7,8,9");
+  scrolling = yield hasScrollbar();
+  ok(scrolling, "document has scrollbar");
 
   // pin the last tile to make it stay at the bottom of the newtab
-  pinCell(9);
+  yield pinCell(9);
   // block first 6 tiles, which should not remove the scroll bar
   // since the last tile is pinned in the nineth position
   for (let i = 0; i < 6; i++) {
     yield blockCell(0);
   }
-  yield addNewTabPageTab();
-  checkGrid("6,7,8,,,,,,,9p");
-  ok(hasScrollbar(), "document has scrollbar when tile is pinned to the last row");
+  yield* addNewTabPageTab();
+  yield* checkGrid("6,7,8,,,,,,,9p");
+  scrolling = yield hasScrollbar();
+  ok(scrolling, "document has scrollbar when tile is pinned to the last row");
 
   // unpin the site: this will move tile up and make scrollbar disappear
   yield unpinCell(9);
-  yield addNewTabPageTab();
-  checkGrid("6,7,8,9");
-  ok(!hasScrollbar(), "no scrollbar when bottom row tile is unpinned");
+  yield* addNewTabPageTab();
+  yield* checkGrid("6,7,8,9");
+  scrolling = yield hasScrollbar();
+  ok(!scrolling, "no scrollbar when bottom row tile is unpinned");
 
   // reset everything to clean slate
   NewTabUtils.restore();
@@ -87,30 +88,35 @@ function runTests() {
 
   // setup page with no history tiles to test directory only display
   yield setLinks([]);
-  yield addNewTabPageTab();
-  ok(!hasScrollbar(), "no scrollbar for directory tiles");
+  yield* addNewTabPageTab();
+  ok(!scrolling, "no scrollbar for directory tiles");
 
   // introduce one history tile - it should occupy the last
   // available slot at the bottom of newtab and cause scrollbar
   yield setLinks("41");
-  yield addNewTabPageTab();
-  ok(hasScrollbar(), "adding low frecency history site causes scrollbar");
+  yield* addNewTabPageTab();
+  scrolling = yield hasScrollbar();
+  ok(scrolling, "adding low frecency history site causes scrollbar");
 
   // set PREF_NEWTAB_ROWS to 4, that should clip off the history tile
   // and remove scroll bar
-  Services.prefs.setIntPref(PREF_NEWTAB_ROWS, 4);
-  yield addNewTabPageTab();
-  ok(!hasScrollbar(), "no scrollbar if history tiles falls past max rows");
+  yield pushPrefs([PREF_NEWTAB_ROWS, 4]);
+  yield* addNewTabPageTab();
+
+  scrolling = yield hasScrollbar();
+  ok(!scrolling, "no scrollbar if history tiles falls past max rows");
 
   // restore max rows and watch scrollbar re-appear
-  Services.prefs.setIntPref(PREF_NEWTAB_ROWS, 5);
-  yield addNewTabPageTab();
-  ok(hasScrollbar(), "scrollbar is back when max rows allow for bottom history tile");
+  yield pushPrefs([PREF_NEWTAB_ROWS, 5]);
+  yield* addNewTabPageTab();
+  scrolling = yield hasScrollbar();
+  ok(scrolling, "scrollbar is back when max rows allow for bottom history tile");
 
   // block that history tile, and watch scrollbar disappear
   yield blockCell(14);
-  yield addNewTabPageTab();
-  ok(!hasScrollbar(), "no scrollbar after bottom history tiles is blocked");
+  yield* addNewTabPageTab();
+  scrolling = yield hasScrollbar();
+  ok(!scrolling, "no scrollbar after bottom history tiles is blocked");
 
   // Test well-populated user history - newtab has highly-frecent history sites
   // redefine compareLinks to always choose history tiles first
@@ -131,12 +137,14 @@ function runTests() {
 
   // add a row of history tiles, directory tiles will be clipped off, hence no scrollbar
   yield setLinks("31,32,33");
-  yield addNewTabPageTab();
-  ok(!hasScrollbar(), "no scrollbar when directory tiles follow history tiles");
+  yield* addNewTabPageTab();
+  scrolling = yield hasScrollbar();
+  ok(!scrolling, "no scrollbar when directory tiles follow history tiles");
 
   // fill first four rows with history tiles and observer scrollbar
   yield setLinks("30,31,32,33,34,35,36,37,38,39");
-  yield addNewTabPageTab();
-  ok(hasScrollbar(), "scrollbar appears when history tiles need extra row");
+  yield* addNewTabPageTab();
+  scrolling = yield hasScrollbar();
+  ok(scrolling, "scrollbar appears when history tiles need extra row");
+});
 
-}

browser/base/content/test/newtab/head.js

@@ -833,6 +833,8 @@ function customizeNewTabPage(aTheme) {
  * Reports presence of a scrollbar
  */
 function hasScrollbar() {
-  let docElement = getContentDocument().documentElement;
-  return docElement.scrollHeight > docElement.clientHeight;
+  return ContentTask.spawn(gWindow.gBrowser.selectedBrowser, {}, function* () {
+    let docElement = content.document.documentElement;
+    return docElement.scrollHeight > docElement.clientHeight;
+  });
 }