Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/thumbnails/content_analysis_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/content_analysis.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <functional>
@@ skipping 60 matching lines @@
 }
 
 }  // namespace
 
 namespace thumbnailing_utils {
 
 class ThumbnailContentAnalysisTest : public testing::Test {
 };
 
 TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnImpulse) {
-  gfx::Canvas canvas(gfx::Size(800, 600), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of vertical non-overlapping stripes 100 pixels wide.
   canvas.FillRect(gfx::Rect(0, 0, 800, 600), SkColorSetARGB(0, 10, 10, 10));
   canvas.FillRect(gfx::Rect(400, 300, 1, 1), SkColorSetRGB(255, 255, 255));
 
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   SkBitmap reduced_color;
   reduced_color.setConfig(
@@ skipping 30 matching lines @@
 }
 
 // http://crbug.com/234336
 #if defined(OS_MACOSX)
 #define MAYBE_ApplyGradientMagnitudeOnFrame \
     DISABLED_ApplyGradientMagnitudeOnFrame
 #else
 #define MAYBE_ApplyGradientMagnitudeOnFrame ApplyGradientMagnitudeOnFrame
 #endif
 TEST_F(ThumbnailContentAnalysisTest, MAYBE_ApplyGradientMagnitudeOnFrame) {
-  gfx::Canvas canvas(gfx::Size(800, 600), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a single white block in the centre.
   gfx::Rect draw_rect(300, 200, 200, 200);
   canvas.FillRect(gfx::Rect(0, 0, 800, 600), SkColorSetARGB(0, 0, 0, 0));
   canvas.DrawRect(draw_rect, SkColorSetRGB(255, 255, 255));
 
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
 
   SkBitmap reduced_color;
@@ skipping 18 matching lines @@
                        draw_rect.width() - 2 * tail_length,
                        draw_rect.height() - 2 * tail_length);
   unsigned long data_sum = ImagePixelSum(reduced_color, outer_rect);
   unsigned long all_sum = ImagePixelSum(reduced_color, gfx::Rect(800, 600));
   EXPECT_GT(data_sum, 0U);
   EXPECT_EQ(data_sum, all_sum);
   EXPECT_EQ(ImagePixelSum(reduced_color, inner_rect), 0U);
 }
 
 TEST_F(ThumbnailContentAnalysisTest, ExtractImageProfileInformation) {
-  gfx::Canvas canvas(gfx::Size(800, 600), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a white frame drawn in the centre.
   gfx::Rect draw_rect(100, 100, 200, 100);
   gfx::Rect image_rect(0, 0, 800, 600);
   canvas.FillRect(image_rect, SkColorSetARGB(0, 0, 0, 0));
   canvas.DrawRect(draw_rect, SkColorSetRGB(255, 255, 255));
 
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   SkBitmap reduced_color;
@@ skipping 51 matching lines @@
 // http://crbug.com/234336
 #if defined(OS_MACOSX)
 #define MAYBE_ExtractImageProfileInformationWithClosing \
     DISABLED_ExtractImageProfileInformationWithClosing
 #else
 #define MAYBE_ExtractImageProfileInformationWithClosing \
     ExtractImageProfileInformationWithClosing
 #endif
 TEST_F(ThumbnailContentAnalysisTest,
        MAYBE_ExtractImageProfileInformationWithClosing) {
-  gfx::Canvas canvas(gfx::Size(800, 600), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(800, 600), 1.0f, true);
 
   // The image consists of a two white frames drawn side by side, with a
   // single-pixel vertical gap in between.
   gfx::Rect image_rect(0, 0, 800, 600);
   canvas.FillRect(image_rect, SkColorSetARGB(0, 0, 0, 0));
   canvas.DrawRect(gfx::Rect(300, 250, 99, 100), SkColorSetRGB(255, 255, 255));
   canvas.DrawRect(gfx::Rect(401, 250, 99, 100), SkColorSetRGB(255, 255, 255));
 
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
@@ skipping 314 matching lines @@
       columns_guide.begin(), columns_guide.end(), true);
   float expected_aspect =
       static_cast<float>(target_size.width()) / target_size.height();
   float actual_aspect = static_cast<float>(column_count) / row_count;
   EXPECT_GE(1.05f, expected_aspect / actual_aspect);
   EXPECT_GE(1.05f, actual_aspect / expected_aspect);
 }
 
 TEST_F(ThumbnailContentAnalysisTest, ComputeDecimatedImage) {
   gfx::Size image_size(1600, 1200);
-  gfx::Canvas canvas(image_size, ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(image_size, 1.0f, true);
 
   // Make some content we will later want to keep.
   canvas.FillRect(gfx::Rect(100, 200, 100, 100), SkColorSetARGB(0, 125, 0, 0));
   canvas.FillRect(gfx::Rect(300, 200, 100, 100), SkColorSetARGB(0, 0, 200, 0));
   canvas.FillRect(gfx::Rect(500, 200, 100, 100), SkColorSetARGB(0, 0, 0, 225));
   canvas.FillRect(gfx::Rect(100, 400, 600, 100),
                   SkColorSetARGB(0, 125, 200, 225));
 
   std::vector<bool> rows(image_size.height(), false);
   std::fill_n(rows.begin() + 200, 100, true);
@@ skipping 29 matching lines @@
                                     gfx::Point(200, 0)));
   ASSERT_TRUE(CompareImageFragments(source,
                                     result,
                                     gfx::Size(100, 100),
                                     gfx::Point(100, 400),
                                     gfx::Point(0, 0)));
 }
 
 TEST_F(ThumbnailContentAnalysisTest, CreateRetargetedThumbnailImage) {
   gfx::Size image_size(1200, 1300);
-  gfx::Canvas canvas(image_size, ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(image_size, 1.0f, true);
 
   // The following will create a 'fake image' consisting of color blocks placed
   // on a neutral background. The entire layout is supposed to mimic a
   // screenshot of a web page.
   // The tested function is supposed to locate the interesing areas in the
   // middle.
   const int margin_horizontal = 60;
   const int margin_vertical = 20;
   canvas.FillRect(gfx::Rect(image_size), SkColorSetRGB(200, 210, 210));
   const gfx::Rect header_rect(margin_horizontal,
@@ skipping 82 matching lines @@
 
   int histogram[256] = {};
   color_utils::BuildLumaHistogram(result, histogram);
   int non_zero_color_count = std::count_if(
       histogram, histogram + 256, std::bind2nd(std::greater<int>(), 0));
   EXPECT_GT(non_zero_color_count, 4);
 
 }
 
 }  // namespace thumbnailing_utils