Cleanup changes related to replacing usage of GetImageScale with GetScaleForScaleFactor

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/big_endian.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/data_pack.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image_skia.h"
+#if defined(OS_WIN)
+#include "ui/gfx/win/dpi.h"
+#endif
 
 using ::testing::_;
 using ::testing::Between;
 using ::testing::Property;
 using ::testing::Return;
 using ::testing::ReturnArg;
 
 namespace ui {
 
 extern const char kSamplePakContents[];
@@ skipping 398 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) {
+#if defined(OS_WIN)
+  gfx::ForceHighDPISupportForTesting(2.0);
+#endif
   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());
@@ skipping 12 matching lines @@
   EXPECT_EQ(ui::SCALE_FACTOR_200P,
             GetSupportedScaleFactor(image_skia->image_reps()[0].scale()));
 #else
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             GetSupportedScaleFactor(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(GetImageScale(ui::SCALE_FACTOR_100P));
+      image_skia->GetRepresentation(
+      GetScaleForScaleFactor(ui::SCALE_FACTOR_100P));
   EXPECT_EQ(ui::SCALE_FACTOR_100P, GetSupportedScaleFactor(image_rep.scale()));
   image_rep =
-      image_skia->GetRepresentation(GetImageScale(ui::SCALE_FACTOR_200P));
+      image_skia->GetRepresentation(
+      GetScaleForScaleFactor(ui::SCALE_FACTOR_200P));
   EXPECT_EQ(ui::SCALE_FACTOR_200P, GetSupportedScaleFactor(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::GetImageScale(ui::SCALE_FACTOR_140P));
+      ui::GetScaleForScaleFactor(ui::SCALE_FACTOR_140P));
   ui::ScaleFactor scale_factor = GetSupportedScaleFactor(image_rep.scale());
   EXPECT_TRUE(scale_factor == ui::SCALE_FACTOR_100P ||
               scale_factor == ui::SCALE_FACTOR_200P);
 #if !defined(OS_WIN)
   // If the image is not found, the it should simply image rep should
   // contain the scale of the image rep, not the requested scale.
   EXPECT_EQ(1.0f, image_skia->GetRepresentation(1.4f).scale());
 #endif
 }
 
@@ skipping 18 matching lines @@
   // 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(GetImageScale(ui::SCALE_FACTOR_200P));
+      image_skia->GetRepresentation(GetScaleForScaleFactor(
+      ui::SCALE_FACTOR_200P));
   EXPECT_EQ(ui::SCALE_FACTOR_200P, GetSupportedScaleFactor(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) {
@@ skipping 18 matching lines @@
 
   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(
-      GetImageScale(ui::SCALE_FACTOR_140P));
+    GetScaleForScaleFactor(ui::SCALE_FACTOR_140P));
   EXPECT_EQ(12, image_rep.pixel_width());
   image_rep = image_skia->GetRepresentation(
-    GetImageScale(ui::SCALE_FACTOR_180P));
+    GetScaleForScaleFactor(ui::SCALE_FACTOR_180P));
   EXPECT_EQ(15, image_rep.pixel_width());
 }
 #endif
 
 #if defined(OS_IOS)
 // Fails on devices that have non-100P scaling. See crbug.com/298406
 #define MAYBE_FallbackToNone DISABLED_FallbackToNone
 #else
 #define MAYBE_FallbackToNone FallbackToNone
 #endif
 TEST_F(ResourceBundleImageTest, MAYBE_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_TRUE(image_skia->image_reps()[0].unscaled());
   EXPECT_EQ(ui::SCALE_FACTOR_100P,
             GetSupportedScaleFactor(image_skia->image_reps()[0].scale()));
 }
 
 }  // namespace ui