Remove dependency on ui::ScaleFactor from ui/gfx

ui/base/resource/resource_bundle_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/base/resource/resource_bundle.h"
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 415 matching lines @@
   // for both scale factor requests.
   EXPECT_EQ("this is id 6", resource_bundle->GetRawDataResourceForScale(6,
       SCALE_FACTOR_100P));
   EXPECT_EQ("this is id 6", resource_bundle->GetRawDataResourceForScale(6,
       SCALE_FACTOR_200P));
 }
 
 // Test requesting image reps at various scale factors from the image returned
 // via ResourceBundle::GetImageNamed().
 TEST_F(ResourceBundleImageTest, GetImageNamed) {
+  std::vector<ScaleFactor> supported_factors;
+  supported_factors.push_back(SCALE_FACTOR_100P);
+  supported_factors.push_back(SCALE_FACTOR_200P);
+  test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
   base::FilePath data_1x_path = dir_path().AppendASCII("sample_1x.pak");
   base::FilePath data_2x_path = dir_path().AppendASCII("sample_2x.pak");
 
   // Create the pak files.
   CreateDataPackWithSingleBitmap(data_1x_path, 10, base::StringPiece());
   CreateDataPackWithSingleBitmap(data_2x_path, 20, base::StringPiece());
 
   // Load the regular and 2x pak files.
   ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();
   resource_bundle->AddDataPackFromPath(data_1x_path, SCALE_FACTOR_100P);
   resource_bundle->AddDataPackFromPath(data_2x_path, SCALE_FACTOR_200P);
 
   EXPECT_EQ(SCALE_FACTOR_200P, resource_bundle->max_scale_factor());
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
 
 #if defined(OS_CHROMEOS)
   // ChromeOS loads highest scale factor first.
-  EXPECT_EQ(ui::SCALE_FACTOR_200P, image_skia->image_reps()[0].scale_factor());
+  EXPECT_EQ(ui::SCALE_FACTOR_200P,
+            GetScaleFactorFromScale(image_skia->image_reps()[0].scale()));
 #else
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, image_skia->image_reps()[0].scale_factor());
+  EXPECT_EQ(ui::SCALE_FACTOR_100P,
+            GetScaleFactorFromScale(image_skia->image_reps()[0].scale()));
 #endif
 
   // Resource ID 3 exists in both 1x and 2x paks. Image reps should be
   // available for both scale factors in |image_skia|.
   gfx::ImageSkiaRep image_rep =
-      image_skia->GetRepresentation(ui::SCALE_FACTOR_100P);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, image_rep.scale_factor());
-  image_rep = image_skia->GetRepresentation(ui::SCALE_FACTOR_200P);
-  EXPECT_EQ(ui::SCALE_FACTOR_200P, image_rep.scale_factor());
+      image_skia->GetRepresentation(GetScaleFactorScale(ui::SCALE_FACTOR_100P));
+  EXPECT_EQ(ui::SCALE_FACTOR_100P, GetScaleFactorFromScale(image_rep.scale()));
+  image_rep =
+      image_skia->GetRepresentation(GetScaleFactorScale(ui::SCALE_FACTOR_200P));
+  EXPECT_EQ(ui::SCALE_FACTOR_200P, GetScaleFactorFromScale(image_rep.scale()));
 
   // The 1.4x pack was not loaded. Requesting the 1.4x resource should return
   // either the 1x or the 2x resource.
-  image_rep = image_skia->GetRepresentation(ui::SCALE_FACTOR_140P);
-  EXPECT_TRUE(image_rep.scale_factor() == ui::SCALE_FACTOR_100P ||
-              image_rep.scale_factor() == ui::SCALE_FACTOR_200P);
+  image_rep = image_skia->GetRepresentation(
+      ui::GetScaleFactorScale(ui::SCALE_FACTOR_140P));
+  ui::ScaleFactor scale_factor = GetScaleFactorFromScale(image_rep.scale());
+  EXPECT_TRUE(scale_factor == ui::SCALE_FACTOR_100P ||
+              scale_factor == ui::SCALE_FACTOR_200P);
 }
 
 // Test that GetImageNamed() behaves properly for images which GRIT has
 // annotated as having fallen back to 1x.
 TEST_F(ResourceBundleImageTest, GetImageNamedFallback1x) {
+  std::vector<ScaleFactor> supported_factors;
+  supported_factors.push_back(SCALE_FACTOR_100P);
+  supported_factors.push_back(SCALE_FACTOR_200P);
+  test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
   base::FilePath data_path = dir_path().AppendASCII("sample.pak");
   base::FilePath data_2x_path = dir_path().AppendASCII("sample_2x.pak");
 
   // Create the pak files.
   CreateDataPackWithSingleBitmap(data_path, 10, base::StringPiece());
   // 2x data pack bitmap has custom chunk to indicate that the 2x bitmap is not
   // available and that GRIT fell back to 1x.
   CreateDataPackWithSingleBitmap(data_2x_path, 10, base::StringPiece(
       reinterpret_cast<const char*>(kPngScaleChunk),
       arraysize(kPngScaleChunk)));
 
   // Load the regular and 2x pak files.
   ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();
   resource_bundle->AddDataPackFromPath(data_path, SCALE_FACTOR_100P);
   resource_bundle->AddDataPackFromPath(data_2x_path, SCALE_FACTOR_200P);
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
 
   // The image rep for 2x should be available. It should be resized to the
   // proper 2x size.
   gfx::ImageSkiaRep image_rep =
-    image_skia->GetRepresentation(ui::SCALE_FACTOR_200P);
-  EXPECT_EQ(ui::SCALE_FACTOR_200P, image_rep.scale_factor());
+    image_skia->GetRepresentation(GetScaleFactorScale(ui::SCALE_FACTOR_200P));
+  EXPECT_EQ(ui::SCALE_FACTOR_200P, GetScaleFactorFromScale(image_rep.scale()));
   EXPECT_EQ(20, image_rep.pixel_width());
   EXPECT_EQ(20, image_rep.pixel_height());
 }
 
 #if defined(OS_WIN)
 // Tests GetImageNamed() behaves properly when the size of a scaled image
 // requires rounding as a result of using a non-integer scale factor.
 // Scale factors of 140 and 1805 are Windows specific.
 TEST_F(ResourceBundleImageTest, GetImageNamedFallback1xRounding) {
   base::FilePath data_path = dir_path().AppendASCII("sample.pak");
@@ skipping 10 matching lines @@
     arraysize(kPngScaleChunk)));
 
   ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();
   resource_bundle->AddDataPackFromPath(data_path, SCALE_FACTOR_100P);
   resource_bundle->AddDataPackFromPath(data_140P_path, SCALE_FACTOR_140P);
   resource_bundle->AddDataPackFromPath(data_180P_path, SCALE_FACTOR_180P);
 
   // Non-integer dimensions should be rounded up.
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
   gfx::ImageSkiaRep image_rep =
-    image_skia->GetRepresentation(ui::SCALE_FACTOR_140P);
+    image_skia->GetRepresentation(
+      GetScaleFactorScale(ui::SCALE_FACTOR_140P));
   EXPECT_EQ(12, image_rep.pixel_width());
-  image_rep = image_skia->GetRepresentation(ui::SCALE_FACTOR_180P);
+  image_rep = image_skia->GetRepresentation(
+    GetScaleFactorScale(ui::SCALE_FACTOR_180P));
   EXPECT_EQ(15, image_rep.pixel_width());
 }
 #endif
 
 TEST_F(ResourceBundleImageTest, FallbackToNone) {
   base::FilePath data_default_path = dir_path().AppendASCII("sample.pak");
 
   // Create the pak files.
   CreateDataPackWithSingleBitmap(data_default_path, 10, base::StringPiece());
 
     // Load the regular pak files only.
   ResourceBundle* resource_bundle = CreateResourceBundleWithEmptyLocalePak();
   resource_bundle->AddDataPackFromPath(data_default_path, SCALE_FACTOR_NONE);
 
   gfx::ImageSkia* image_skia = resource_bundle->GetImageSkiaNamed(3);
   EXPECT_EQ(1u, image_skia->image_reps().size());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
-            image_skia->image_reps()[0].scale_factor());
+            GetScaleFactorFromScale(image_skia->image_reps()[0].scale()));
 }
 
 }  // namespace ui