Revert 147915 - Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/tab_contents/thumbnail_generator_unittest.cc

Index: chrome/browser/tab_contents/thumbnail_generator_unittest.cc
===================================================================
--- chrome/browser/tab_contents/thumbnail_generator_unittest.cc	(revision 147935)
+++ chrome/browser/tab_contents/thumbnail_generator_unittest.cc	(working copy)
@@ -29,7 +29,7 @@
 
 TEST_F(ThumbnailGeneratorTest, CalculateBoringScore_SingleColor) {
   const gfx::Size kSize(20, 10);
-  gfx::Canvas canvas(kSize, ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(kSize, true);
   // Fill all pixesl in black.
   canvas.FillRect(gfx::Rect(kSize), SK_ColorBLACK);
 
@@ -42,7 +42,7 @@
 TEST_F(ThumbnailGeneratorTest, CalculateBoringScore_TwoColors) {
   const gfx::Size kSize(20, 10);
 
-  gfx::Canvas canvas(kSize, ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(kSize, true);
   // Fill all pixesl in black.
   canvas.FillRect(gfx::Rect(kSize), SK_ColorBLACK);
   // Fill the left half pixels in white.
@@ -59,7 +59,7 @@
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_TallerThanWide) {
   // The input bitmap is vertically long.
-  gfx::Canvas canvas(gfx::Size(40, 90), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(40, 90), true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
@@ -76,7 +76,7 @@
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_WiderThanTall) {
   // The input bitmap is horizontally long.
-  gfx::Canvas canvas(gfx::Size(70, 40), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(70, 40), true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
@@ -93,7 +93,7 @@
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_TooWiderThanTall) {
   // The input bitmap is horizontally very long.
-  gfx::Canvas canvas(gfx::Size(90, 40), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(90, 40), true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
@@ -110,7 +110,7 @@
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_NotClipped) {
   // The input bitmap is square.
-  gfx::Canvas canvas(gfx::Size(40, 40), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(40, 40), true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
@@ -127,7 +127,7 @@
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_NonSquareOutput) {
   // The input bitmap is square.
-  gfx::Canvas canvas(gfx::Size(40, 40), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(40, 40), true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);