Convert ui::ScaleFactor -> float in favicon/history code

chrome/browser/history/select_favicon_frames_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 "components/favicon_base/select_favicon_frames.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/layout.h"
 #include "ui/gfx/image/image_skia.h"
 
 using std::vector;
 
 namespace {
 
-vector<ui::ScaleFactor> Scale1x() {
-  return vector<ui::ScaleFactor>(1, ui::SCALE_FACTOR_100P);
+vector<float> FaviconScale1x() {
+  return vector<float>(1, 1.0f);
 }
 
-vector<ui::ScaleFactor> Scale1x2x() {
-  vector<ui::ScaleFactor> scales;
-  scales.push_back(ui::SCALE_FACTOR_100P);
-  scales.push_back(ui::SCALE_FACTOR_200P);
+vector<float> FaviconScale1x2x() {
+  vector<float> scales;
+  scales.push_back(1.0f);
+  scales.push_back(2.0f);
   return scales;
 }
 
 // Return gfx::Size vector with the pixel sizes of |bitmaps|.
 vector<gfx::Size> SizesFromBitmaps(const vector<SkBitmap>& bitmaps) {
   vector<gfx::Size> sizes;
   for (size_t i = 0; i < bitmaps.size(); ++i)
     sizes.push_back(gfx::Size(bitmaps[i].width(), bitmaps[i].height()));
   return sizes;
 }
 
 SkBitmap MakeBitmap(SkColor color, int w, int h) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, w, h);
   bitmap.allocPixels();
   bitmap.eraseColor(color);
   return bitmap;
 }
 
-SkColor GetColor(const gfx::ImageSkia& image, ui::ScaleFactor factor,
-                 int x = -1, int y = -1) {
-  const SkBitmap& bitmap =
-      image.GetRepresentation(ui::GetScaleForScaleFactor(factor)).sk_bitmap();
+SkColor GetColor(const gfx::ImageSkia& image,
+                 float scale,
+                 int x = -1,
+                 int y = -1) {
+  const SkBitmap& bitmap = image.GetRepresentation(scale).sk_bitmap();
   if (x == -1)
     x = bitmap.width() / 2;
   if (y == -1)
     y = bitmap.width() / 2;
   bitmap.lockPixels();
   SkColor color = bitmap.getColor(x, y);
   bitmap.unlockPixels();
   return color;
 }
 
 SkColor GetColor1x(const gfx::ImageSkia& image) {
-  return GetColor(image, ui::SCALE_FACTOR_100P);
+  return GetColor(image, 1.0f);
 }
 
 SkColor GetColor2x(const gfx::ImageSkia& image) {
-  return GetColor(image, ui::SCALE_FACTOR_200P);
+  return GetColor(image, 2.0f);
 }
 
 TEST(SelectFaviconFramesTest, ZeroSizePicksLargest) {
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorRED, 16, 16));
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 48, 48));
   bitmaps.push_back(MakeBitmap(SK_ColorBLUE, 32, 32));
 
-  gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
-      SizesFromBitmaps(bitmaps), Scale1x(), 0, NULL);
+  gfx::ImageSkia image = SelectFaviconFrames(
+      bitmaps, SizesFromBitmaps(bitmaps), FaviconScale1x(), 0, NULL);
   EXPECT_EQ(1u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   EXPECT_EQ(48, image.width());
   EXPECT_EQ(48, image.height());
 
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
 }
 
 TEST(SelectFaviconFramesTest, _16From16) {
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorRED, 15, 15));
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
   bitmaps.push_back(MakeBitmap(SK_ColorBLUE, 17, 17));
 
-  gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
-      SizesFromBitmaps(bitmaps), Scale1x(), 16, NULL);
+  gfx::ImageSkia image = SelectFaviconFrames(
+      bitmaps, SizesFromBitmaps(bitmaps), FaviconScale1x(), 16, NULL);
   EXPECT_EQ(1u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
 }
 
 TEST(SelectFaviconFramesTest, _16From17) {
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorRED, 15, 15));
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 17, 17));
 
   // Should resample from the bigger candidate.
-  gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
-      SizesFromBitmaps(bitmaps), Scale1x(), 16, NULL);
+  gfx::ImageSkia image = SelectFaviconFrames(
+      bitmaps, SizesFromBitmaps(bitmaps), FaviconScale1x(), 16, NULL);
   EXPECT_EQ(1u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
 }
 
 TEST(SelectFaviconFramesTest, _16From15) {
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorRED, 14, 14));
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
 
   // If nothing else is available, should resample from the next smaller
   // candidate.
-  gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
-      SizesFromBitmaps(bitmaps), Scale1x(), 16, NULL);
+  gfx::ImageSkia image = SelectFaviconFrames(
+      bitmaps, SizesFromBitmaps(bitmaps), FaviconScale1x(), 16, NULL);
   EXPECT_EQ(1u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
 }
 
 TEST(SelectFaviconFramesTest, _16From16_Scale2x_32_From_16) {
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
 
-  gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
-      SizesFromBitmaps(bitmaps), Scale1x2x(), 16, NULL);
+  gfx::ImageSkia image = SelectFaviconFrames(
+      bitmaps, SizesFromBitmaps(bitmaps), FaviconScale1x2x(), 16, NULL);
   EXPECT_EQ(2u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   ASSERT_TRUE(image.HasRepresentation(2.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
   EXPECT_EQ(SK_ColorGREEN, GetColor2x(image));
 }
 
 TEST(SelectFaviconFramesTest, _16From16_Scale2x_32_From_32) {
   vector<SkBitmap> bitmaps;
   bitmaps.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
   bitmaps.push_back(MakeBitmap(SK_ColorBLUE, 32, 32));
 
-  gfx::ImageSkia image = SelectFaviconFrames(bitmaps,
-      SizesFromBitmaps(bitmaps), Scale1x2x(), 16, NULL);
+  gfx::ImageSkia image = SelectFaviconFrames(
+      bitmaps, SizesFromBitmaps(bitmaps), FaviconScale1x2x(), 16, NULL);
   EXPECT_EQ(2u, image.image_reps().size());
   ASSERT_TRUE(image.HasRepresentation(1.0f));
   ASSERT_TRUE(image.HasRepresentation(2.0f));
   EXPECT_EQ(16, image.width());
   EXPECT_EQ(16, image.height());
   EXPECT_EQ(SK_ColorGREEN, GetColor1x(image));
   EXPECT_EQ(SK_ColorBLUE, GetColor2x(image));
 }
 
 TEST(SelectFaviconFramesTest, ExactMatchBetterThanLargeBitmap) {
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 48, 48));
-  SelectFaviconFrames(bitmaps1,
-      SizesFromBitmaps(bitmaps1), Scale1x2x(), 16, &score1);
+  SelectFaviconFrames(
+      bitmaps1, SizesFromBitmaps(bitmaps1), FaviconScale1x2x(), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 32, 32));
-  SelectFaviconFrames(bitmaps2,
-      SizesFromBitmaps(bitmaps2), Scale1x2x(), 16, &score2);
+  SelectFaviconFrames(
+      bitmaps2, SizesFromBitmaps(bitmaps2), FaviconScale1x2x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 TEST(SelectFaviconFramesTest, UpsampleABitBetterThanHugeBitmap) {
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 128, 128));
-  SelectFaviconFrames(bitmaps1,
-      SizesFromBitmaps(bitmaps1), Scale1x2x(), 16, &score1);
+  SelectFaviconFrames(
+      bitmaps1, SizesFromBitmaps(bitmaps1), FaviconScale1x2x(), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24));
-  SelectFaviconFrames(bitmaps2,
-      SizesFromBitmaps(bitmaps2), Scale1x2x(), 16, &score2);
+  SelectFaviconFrames(
+      bitmaps2, SizesFromBitmaps(bitmaps2), FaviconScale1x2x(), 16, &score2);
 
   float score3;
   vector<SkBitmap> bitmaps3;
   bitmaps3.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
-  SelectFaviconFrames(bitmaps3,
-      SizesFromBitmaps(bitmaps3), Scale1x2x(), 16, &score3);
+  SelectFaviconFrames(
+      bitmaps3, SizesFromBitmaps(bitmaps3), FaviconScale1x2x(), 16, &score3);
 
   float score4;
   vector<SkBitmap> bitmaps4;
   bitmaps4.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
-  SelectFaviconFrames(bitmaps4,
-      SizesFromBitmaps(bitmaps4), Scale1x2x(), 16, &score4);
+  SelectFaviconFrames(
+      bitmaps4, SizesFromBitmaps(bitmaps4), FaviconScale1x2x(), 16, &score4);
 
   EXPECT_GT(score2, score1);
   EXPECT_GT(score3, score1);
   EXPECT_GT(score4, score1);
 }
 
 TEST(SelectFaviconFramesTest, DownsamplingBetterThanUpsampling) {
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 8, 8));
-  SelectFaviconFrames(bitmaps1,
-      SizesFromBitmaps(bitmaps1), Scale1x(), 16, &score1);
+  SelectFaviconFrames(
+      bitmaps1, SizesFromBitmaps(bitmaps1), FaviconScale1x(), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24));
-  SelectFaviconFrames(bitmaps2,
-      SizesFromBitmaps(bitmaps2), Scale1x(), 16, &score2);
+  SelectFaviconFrames(
+      bitmaps2, SizesFromBitmaps(bitmaps2), FaviconScale1x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 TEST(SelectFaviconFramesTest, DownsamplingLessIsBetter) {
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 34, 34));
-  SelectFaviconFrames(bitmaps1,
-      SizesFromBitmaps(bitmaps1), Scale1x2x(), 16, &score1);
+  SelectFaviconFrames(
+      bitmaps1, SizesFromBitmaps(bitmaps1), FaviconScale1x2x(), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 33, 33));
-  SelectFaviconFrames(bitmaps2,
-      SizesFromBitmaps(bitmaps2), Scale1x2x(), 16, &score2);
+  SelectFaviconFrames(
+      bitmaps2, SizesFromBitmaps(bitmaps2), FaviconScale1x2x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 TEST(SelectFaviconFramesTest, UpsamplingLessIsBetter) {
   float score1;
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 8, 8));
-  SelectFaviconFrames(bitmaps1,
-      SizesFromBitmaps(bitmaps1), Scale1x2x(), 16, &score1);
+  SelectFaviconFrames(
+      bitmaps1, SizesFromBitmaps(bitmaps1), FaviconScale1x2x(), 16, &score1);
 
   float score2;
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 9, 9));
-  SelectFaviconFrames(bitmaps2,
-      SizesFromBitmaps(bitmaps2), Scale1x2x(), 16, &score2);
+  SelectFaviconFrames(
+      bitmaps2, SizesFromBitmaps(bitmaps2), FaviconScale1x2x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 // Test that the score is determined by the |original_sizes| parameter, not the
 // |bitmaps| parameter to SelectFaviconFrames().
 TEST(SelectFaviconFramesTest, ScoreDeterminedByOriginalSizes) {
   vector<SkBitmap> bitmaps1;
   bitmaps1.push_back(MakeBitmap(SK_ColorGREEN, 16, 16));
   vector<gfx::Size> sizes1;
   sizes1.push_back(gfx::Size(256, 256));
   float score1;
-  SelectFaviconFrames(bitmaps1, sizes1, Scale1x(), 16, &score1);
+  SelectFaviconFrames(bitmaps1, sizes1, FaviconScale1x(), 16, &score1);
 
   vector<SkBitmap> bitmaps2;
   bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));
   vector<gfx::Size> sizes2;
   sizes2.push_back(gfx::Size(15, 15));
   float score2;
-  SelectFaviconFrames(bitmaps2, sizes2, Scale1x(), 16, &score2);
+  SelectFaviconFrames(bitmaps2, sizes2, FaviconScale1x(), 16, &score2);
 
   EXPECT_GT(score2, score1);
 }
 
 }  // namespace