Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/color_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 "ui/gfx/color_analysis.h"
 
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 277 matching lines @@
   EXPECT_EQ(gfx::Matrix3F::Zeros(),
             color_utils::ComputeColorCovariance(bitmap));
   bitmap.allocPixels();
   bitmap.eraseRGB(50, 150, 200);
   gfx::Matrix3F covariance = color_utils::ComputeColorCovariance(bitmap);
   // The answer should be all zeros.
   EXPECT_TRUE(covariance == gfx::Matrix3F::Zeros());
 }
 
 TEST_F(ColorAnalysisTest, ComputeColorCovarianceWithCanvas) {
-  gfx::Canvas canvas(gfx::Size(250, 200), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(250, 200), 1.0f, true);
   // The image consists of vertical stripes, with color bands set to 100
   // in overlapping stripes 150 pixels wide.
   canvas.FillRect(gfx::Rect(0, 0, 50, 200), SkColorSetRGB(100, 0, 0));
   canvas.FillRect(gfx::Rect(50, 0, 50, 200), SkColorSetRGB(100, 100, 0));
   canvas.FillRect(gfx::Rect(100, 0, 50, 200), SkColorSetRGB(100, 100, 100));
   canvas.FillRect(gfx::Rect(150, 0, 50, 200), SkColorSetRGB(0, 100, 100));
   canvas.FillRect(gfx::Rect(200, 0, 50, 200), SkColorSetRGB(0, 0, 100));
 
   SkBitmap bitmap =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
@@ skipping 48 matching lines @@
   EXPECT_TRUE(color_utils::ApplyColorReduction(
       source, transform, false, &result));
   Calculate8bitBitmapMinMax(result, &min_gl, &max_gl);
   EXPECT_EQ(0x0, min_gl);
   EXPECT_EQ(0x0, max_gl);
 }
 
 TEST_F(ColorAnalysisTest, ApplyColorReductionBlackAndWhite) {
   // Check with images with multiple colors. This is really different only when
   // the result is scaled.
-  gfx::Canvas canvas(gfx::Size(300, 200), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(300, 200), 1.0f, true);
 
   // The image consists of vertical non-overlapping stripes 150 pixels wide.
   canvas.FillRect(gfx::Rect(0, 0, 150, 200), SkColorSetRGB(0, 0, 0));
   canvas.FillRect(gfx::Rect(150, 0, 150, 200), SkColorSetRGB(255, 255, 255));
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   SkBitmap result;
   result.setConfig(SkBitmap::kA8_Config, 300, 200);
   result.allocPixels();
 
@@ skipping 19 matching lines @@
 
   EXPECT_EQ(0, min_gl);
   EXPECT_EQ(255, max_gl);
   EXPECT_EQ(max_gl, SkColorGetA(result.getColor(0, 0)));
   EXPECT_EQ(min_gl, SkColorGetA(result.getColor(299, 199)));
 }
 
 TEST_F(ColorAnalysisTest, ApplyColorReductionMultiColor) {
   // Check with images with multiple colors. This is really different only when
   // the result is scaled.
-  gfx::Canvas canvas(gfx::Size(300, 200), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(300, 200), 1.0f, true);
 
   // The image consists of vertical non-overlapping stripes 100 pixels wide.
   canvas.FillRect(gfx::Rect(0, 0, 100, 200), SkColorSetRGB(100, 0, 0));
   canvas.FillRect(gfx::Rect(100, 0, 100, 200), SkColorSetRGB(0, 255, 0));
   canvas.FillRect(gfx::Rect(200, 0, 100, 200), SkColorSetRGB(0, 0, 128));
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   SkBitmap result;
   result.setConfig(SkBitmap::kA8_Config, 300, 200);
   result.allocPixels();
@@ skipping 27 matching lines @@
 
   source.allocPixels();
   result.allocPixels();
   source.eraseRGB(50, 150, 200);
 
   // This computation should fail since all colors always vary together.
   EXPECT_FALSE(color_utils::ComputePrincipalComponentImage(source, &result));
 }
 
 TEST_F(ColorAnalysisTest, ComputePrincipalComponentImage) {
-  gfx::Canvas canvas(gfx::Size(300, 200), ui::SCALE_FACTOR_100P, true);
+  gfx::Canvas canvas(gfx::Size(300, 200), 1.0f, true);
 
   // The image consists of vertical non-overlapping stripes 100 pixels wide.
   canvas.FillRect(gfx::Rect(0, 0, 100, 200), SkColorSetRGB(10, 10, 10));
   canvas.FillRect(gfx::Rect(100, 0, 100, 200), SkColorSetRGB(100, 100, 100));
   canvas.FillRect(gfx::Rect(200, 0, 100, 200), SkColorSetRGB(255, 255, 255));
   SkBitmap source =
       skia::GetTopDevice(*canvas.sk_canvas())->accessBitmap(false);
   SkBitmap result;
   result.setConfig(SkBitmap::kA8_Config, 300, 200);
   result.allocPixels();
 
   // This computation should fail since all colors always vary together.
   EXPECT_TRUE(color_utils::ComputePrincipalComponentImage(source, &result));
 
   uint8_t min_gl = 0;
   uint8_t max_gl = 0;
   Calculate8bitBitmapMinMax(result, &min_gl, &max_gl);
 
   EXPECT_EQ(0, min_gl);
   EXPECT_EQ(255, max_gl);
   EXPECT_EQ(min_gl, SkColorGetA(result.getColor(0, 0)));
   EXPECT_EQ(max_gl, SkColorGetA(result.getColor(299, 199)));
   EXPECT_EQ(93U, SkColorGetA(result.getColor(150, 0)));
 }