Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/chrome/browser/thumbnails/simple_thumbnail_crop_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 "chrome/browser/thumbnails/simple_thumbnail_crop.h"
 
 #include "base/basictypes.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/thumbnails/thumbnailing_context.h"
 #include "chrome/common/render_messages.h"
@@ skipping 12 matching lines @@
 
 typedef testing::Test SimpleThumbnailCropTest;
 
 TEST_F(SimpleThumbnailCropTest, CalculateBoringScore_Empty) {
   SkBitmap bitmap;
   EXPECT_DOUBLE_EQ(1.0, SimpleThumbnailCrop::CalculateBoringScore(bitmap));
 }
 
 TEST_F(SimpleThumbnailCropTest, CalculateBoringScore_SingleColor) {
   const gfx::Size kSize(20, 10);
-  gfx::Canvas canvas(kSize, 1.0f, true);
+  gfx::Canvas canvas(kSize, ui::SCALE_FACTOR_100P, true);
   // Fill all pixels 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, SimpleThumbnailCrop::CalculateBoringScore(bitmap));
 }
 
 TEST_F(SimpleThumbnailCropTest, CalculateBoringScore_TwoColors) {
   const gfx::Size kSize(20, 10);
 
-  gfx::Canvas canvas(kSize, 1.0f, true);
+  gfx::Canvas canvas(kSize, ui::SCALE_FACTOR_100P, true);
   // Fill all pixels 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, SimpleThumbnailCrop::CalculateBoringScore(bitmap));
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_TallerThanWide) {
   // The input bitmap is vertically long.
-  gfx::Canvas canvas(gfx::Size(40, 90), 1.0f, 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.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::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(thumbnails::CLIP_RESULT_TALLER_THAN_WIDE, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_WiderThanTall) {
   // The input bitmap is horizontally long.
-  gfx::Canvas canvas(gfx::Size(70, 40), 1.0f, 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.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::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(thumbnails::CLIP_RESULT_WIDER_THAN_TALL, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_TooWiderThanTall) {
   // The input bitmap is horizontally very long.
-  gfx::Canvas canvas(gfx::Size(90, 40), 1.0f, 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.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::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(thumbnails::CLIP_RESULT_MUCH_WIDER_THAN_TALL, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_NotClipped) {
   // The input bitmap is square.
-  gfx::Canvas canvas(gfx::Size(40, 40), 1.0f, 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.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::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(thumbnails::CLIP_RESULT_NOT_CLIPPED, clip_result);
 }
 
 TEST_F(SimpleThumbnailCropTest, GetClippedBitmap_NonSquareOutput) {
   // The input bitmap is square.
-  gfx::Canvas canvas(gfx::Size(40, 40), 1.0f, 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.
   thumbnails::ClipResult clip_result = thumbnails::CLIP_RESULT_NOT_CLIPPED;
   SkBitmap clipped_bitmap = SimpleThumbnailCrop::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 81 matching lines @@
   EXPECT_LT(0, clip_rect.x());
   EXPECT_GE(2000, clip_rect.width());
   EXPECT_EQ(800, clip_rect.height());
 
   clip_rect = SimpleThumbnailCrop::GetClippingRect(
       gfx::Size(900, 600), desired_size, &clip_result);
   EXPECT_EQ(thumbnails::CLIP_RESULT_NOT_CLIPPED, clip_result);
   EXPECT_EQ(gfx::Point(0, 0).ToString(), clip_rect.origin().ToString());
   EXPECT_EQ(gfx::Size(900, 600).ToString(), clip_rect.size().ToString());
 }