Cleanup gfx::Canvas now that 10562027 has landed

chrome/browser/tab_contents/thumbnail_generator_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 11 matching lines @@
 
 typedef testing::Test ThumbnailGeneratorTest;
 
 TEST_F(ThumbnailGeneratorTest, CalculateBoringScore_Empty) {
   SkBitmap bitmap;
   EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(bitmap));
 }
 
 TEST_F(ThumbnailGeneratorTest, CalculateBoringScore_SingleColor) {
   const gfx::Size kSize(20, 10);
-  gfx::Canvas canvas(kSize, true);
+  gfx::Canvas canvas(kSize, ui::SCALE_FACTOR_100P, true);
   // Fill all pixesl in black.
   canvas.FillRect(gfx::Rect(kSize), SK_ColorBLACK);
 
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   // The thumbnail should deserve the highest boring score.
   EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(bitmap));
 }
 
 TEST_F(ThumbnailGeneratorTest, CalculateBoringScore_TwoColors) {
   const gfx::Size kSize(20, 10);
 
-  gfx::Canvas canvas(kSize, true);
+  gfx::Canvas canvas(kSize, ui::SCALE_FACTOR_100P, true);
   // Fill all pixesl in black.
   canvas.FillRect(gfx::Rect(kSize), SK_ColorBLACK);
   // Fill the left half pixels in white.
   canvas.FillRect(gfx::Rect(0, 0, kSize.width() / 2, kSize.height()),
                   SK_ColorWHITE);
 
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   ASSERT_EQ(kSize.width(), bitmap.width());
   ASSERT_EQ(kSize.height(), bitmap.height());
   // The thumbnail should be less boring because two colors are used.
   EXPECT_DOUBLE_EQ(0.5, ThumbnailGenerator::CalculateBoringScore(bitmap));
 }
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_TallerThanWide) {
   // The input bitmap is vertically long.
-  gfx::Canvas canvas(gfx::Size(40, 90), true);
+  gfx::Canvas canvas(gfx::Size(40, 90), ui::SCALE_FACTOR_100P, true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   // The desired size is square.
   ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped;
   SkBitmap clipped_bitmap = ThumbnailGenerator::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // The input was taller than wide.
   EXPECT_EQ(ThumbnailGenerator::kTallerThanWide, clip_result);
 }
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_WiderThanTall) {
   // The input bitmap is horizontally long.
-  gfx::Canvas canvas(gfx::Size(70, 40), true);
+  gfx::Canvas canvas(gfx::Size(70, 40), ui::SCALE_FACTOR_100P, true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   // The desired size is square.
   ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped;
   SkBitmap clipped_bitmap = ThumbnailGenerator::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // The input was wider than tall.
   EXPECT_EQ(ThumbnailGenerator::kWiderThanTall, clip_result);
 }
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_TooWiderThanTall) {
   // The input bitmap is horizontally very long.
-  gfx::Canvas canvas(gfx::Size(90, 40), true);
+  gfx::Canvas canvas(gfx::Size(90, 40), ui::SCALE_FACTOR_100P, true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   // The desired size is square.
   ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped;
   SkBitmap clipped_bitmap = ThumbnailGenerator::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // The input was wider than tall.
   EXPECT_EQ(ThumbnailGenerator::kTooWiderThanTall, clip_result);
 }
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_NotClipped) {
   // The input bitmap is square.
-  gfx::Canvas canvas(gfx::Size(40, 40), true);
+  gfx::Canvas canvas(gfx::Size(40, 40), ui::SCALE_FACTOR_100P, true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   // The desired size is square.
   ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped;
   SkBitmap clipped_bitmap = ThumbnailGenerator::GetClippedBitmap(
       bitmap, 10, 10, &clip_result);
   // The clipped bitmap should be square.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(40, clipped_bitmap.height());
   // There was no need to clip.
   EXPECT_EQ(ThumbnailGenerator::kNotClipped, clip_result);
 }
 
 TEST_F(ThumbnailGeneratorTest, GetClippedBitmap_NonSquareOutput) {
   // The input bitmap is square.
-  gfx::Canvas canvas(gfx::Size(40, 40), true);
+  gfx::Canvas canvas(gfx::Size(40, 40), ui::SCALE_FACTOR_100P, true);
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   // The desired size is horizontally long.
   ThumbnailGenerator::ClipResult clip_result = ThumbnailGenerator::kNotClipped;
   SkBitmap clipped_bitmap = ThumbnailGenerator::GetClippedBitmap(
       bitmap, 20, 10, &clip_result);
   // The clipped bitmap should have the same aspect ratio of the desired size.
   EXPECT_EQ(40, clipped_bitmap.width());
   EXPECT_EQ(20, clipped_bitmap.height());
@@ skipping 91 matching lines @@
   good_score.good_clipping = true;
   good_score.boring_score = 0.0;
   good_score.load_completed = true;
   top_sites->AddKnownURL(kGoodURL, good_score);
 
   // Should be false, as the existing thumbnail is good enough (i.e. don't
   // need to replace the existing thumbnail which is new and good).
   EXPECT_FALSE(ThumbnailGenerator::ShouldUpdateThumbnail(
       &profile, top_sites.get(), kGoodURL));
 }