From 539a002c6dd0080252958acf0d4dc5018383124a Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Tue, 12 Jan 2016 11:08:34 -0600
Subject: [PATCH] Bug 1096804 - Enable existing taskbar tests. Remove one test
 that uses old sync api. r=me

---
 browser/modules/test/browser.ini              |  2 +-
 .../modules/test/browser_taskbar_preview.js   | 36 -------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/browser/modules/test/browser.ini b/browser/modules/test/browser.ini
index 60b0ac299ca..909446967e9 100644
--- a/browser/modules/test/browser.ini
+++ b/browser/modules/test/browser.ini
@@ -21,4 +21,4 @@ support-files =
 [browser_SignInToWebsite.js]
 skip-if = e10s # Bug 941426 - SignIntoWebsite.jsm not e10s friendly
 [browser_taskbar_preview.js]
-skip-if = os != win || e10s # Bug 666808 - AeroPeek support for e10s
+skip-if = os != win
diff --git a/browser/modules/test/browser_taskbar_preview.js b/browser/modules/test/browser_taskbar_preview.js
index e2b4faaefa9..a753ce2f062 100644
--- a/browser/modules/test/browser_taskbar_preview.js
+++ b/browser/modules/test/browser_taskbar_preview.js
@@ -50,19 +50,6 @@ function test() {
     ok(checkSelectedTab(), "Current tab is correctly selected");
   });
 
-  let currentSelectedTab = gBrowser.selectedTab;
-  for (let idx of [1,2,3,4]) {
-    let preview = getPreviewForTab(gBrowser.tabs[0]);
-    let canvas = createThumbnailSurface(preview);
-    let ctx = canvas.getContext("2d");
-    preview.controller.drawThumbnail(ctx, canvas.width, canvas.height);
-    ok(currentSelectedTab.selected, "Drawing thumbnail does not change selection");
-    canvas = getCanvas(preview.controller.width, preview.controller.height);
-    ctx = canvas.getContext("2d");
-    preview.controller.drawPreview(ctx);
-    ok(currentSelectedTab.selected, "Drawing preview does not change selection");
-  }
-
   // Close #4
   getPreviewForTab(gBrowser.selectedTab).controller.onClose();
   checkPreviews(3, "Expected number of previews after closing selected tab via controller");
@@ -117,26 +104,3 @@ function test() {
   function isTabSelected(idx) {
     return gBrowser.tabs[idx].selected;
   }
-
-  function createThumbnailSurface(p) {
-    let thumbnailWidth = 200,
-        thumbnailHeight = 120;
-    let ratio = p.controller.thumbnailAspectRatio;
-
-    if (thumbnailWidth/thumbnailHeight > ratio)
-      thumbnailWidth = thumbnailHeight * ratio;
-    else
-      thumbnailHeight = thumbnailWidth / ratio;
-
-    return getCanvas(thumbnailWidth, thumbnailHeight);
-  }
-
-  function getCanvas(width, height) {
-    let win = window.QueryInterface(Ci.nsIDOMWindow);
-    let doc = win.document;
-    let canvas = doc.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
-    canvas.width = width;
-    canvas.height = height;
-    return canvas;
-  }
-}