Remove dependency on ui::ScaleFactor from ui/gfx

ui/base/layout_unittest.cc

Index: ui/base/layout_unittest.cc
diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc
index 8a741821e8c4b9edbfc264749cff3e74b988d770..288cedb1dd549e9e79a12c06cc2e4c076b3d9db8 100644
--- a/ui/base/layout_unittest.cc
+++ b/ui/base/layout_unittest.cc
@@ -14,13 +14,13 @@
 namespace ui {
 
 TEST(LayoutTest, GetScaleFactorScale) {
-  EXPECT_FLOAT_EQ(1.0f, GetScaleFactorScale(SCALE_FACTOR_100P));
-  EXPECT_FLOAT_EQ(1.25f, GetScaleFactorScale(SCALE_FACTOR_125P));
-  EXPECT_FLOAT_EQ(1.33f, GetScaleFactorScale(SCALE_FACTOR_133P));
-  EXPECT_FLOAT_EQ(1.4f, GetScaleFactorScale(SCALE_FACTOR_140P));
-  EXPECT_FLOAT_EQ(1.5f, GetScaleFactorScale(SCALE_FACTOR_150P));
-  EXPECT_FLOAT_EQ(1.8f, GetScaleFactorScale(SCALE_FACTOR_180P));
-  EXPECT_FLOAT_EQ(2.0f, GetScaleFactorScale(SCALE_FACTOR_200P));
+  EXPECT_FLOAT_EQ(1.0f, GetImageScale(SCALE_FACTOR_100P));
+  EXPECT_FLOAT_EQ(1.25f, GetImageScale(SCALE_FACTOR_125P));
+  EXPECT_FLOAT_EQ(1.33f, GetImageScale(SCALE_FACTOR_133P));
+  EXPECT_FLOAT_EQ(1.4f, GetImageScale(SCALE_FACTOR_140P));
+  EXPECT_FLOAT_EQ(1.5f, GetImageScale(SCALE_FACTOR_150P));
+  EXPECT_FLOAT_EQ(1.8f, GetImageScale(SCALE_FACTOR_180P));
+  EXPECT_FLOAT_EQ(2.0f, GetImageScale(SCALE_FACTOR_200P));
 }
 
 TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
@@ -28,14 +28,14 @@ TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
   supported_factors.push_back(SCALE_FACTOR_100P);
   supported_factors.push_back(SCALE_FACTOR_180P);
   test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.1f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.9f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.0f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.39f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.41f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.8f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(2.0f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(999.0f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.1f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.9f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(1.0f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(1.39f));
+  EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.41f));
+  EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.8f));
+  EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(2.0f));
+  EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(999.0f));
 }
 
 TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
@@ -45,37 +45,37 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
   }
   test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
 
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.1f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(0.9f));
-  EXPECT_EQ(SCALE_FACTOR_100P, GetScaleFactorFromScale(1.0f));
-  EXPECT_EQ(SCALE_FACTOR_125P, GetScaleFactorFromScale(1.19f));
-  EXPECT_EQ(SCALE_FACTOR_125P, GetScaleFactorFromScale(1.21f));
-  EXPECT_EQ(SCALE_FACTOR_133P, GetScaleFactorFromScale(1.291f));
-  EXPECT_EQ(SCALE_FACTOR_133P, GetScaleFactorFromScale(1.3f));
-  EXPECT_EQ(SCALE_FACTOR_140P, GetScaleFactorFromScale(1.4f));
-  EXPECT_EQ(SCALE_FACTOR_150P, GetScaleFactorFromScale(1.59f));
-  EXPECT_EQ(SCALE_FACTOR_150P, GetScaleFactorFromScale(1.61f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.7f));
-  EXPECT_EQ(SCALE_FACTOR_180P, GetScaleFactorFromScale(1.89f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(1.91f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.0f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(2.1f));
-  EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(999.0f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.1f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(0.9f));
+  EXPECT_EQ(SCALE_FACTOR_100P, GetSupportedScaleFactor(1.0f));
+  EXPECT_EQ(SCALE_FACTOR_125P, GetSupportedScaleFactor(1.19f));
+  EXPECT_EQ(SCALE_FACTOR_125P, GetSupportedScaleFactor(1.21f));
+  EXPECT_EQ(SCALE_FACTOR_133P, GetSupportedScaleFactor(1.291f));
+  EXPECT_EQ(SCALE_FACTOR_133P, GetSupportedScaleFactor(1.3f));
+  EXPECT_EQ(SCALE_FACTOR_140P, GetSupportedScaleFactor(1.4f));
+  EXPECT_EQ(SCALE_FACTOR_150P, GetSupportedScaleFactor(1.59f));
+  EXPECT_EQ(SCALE_FACTOR_150P, GetSupportedScaleFactor(1.61f));
+  EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.7f));
+  EXPECT_EQ(SCALE_FACTOR_180P, GetSupportedScaleFactor(1.89f));
+  EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(1.91f));
+  EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.0f));
+  EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(2.1f));
+  EXPECT_EQ(SCALE_FACTOR_200P, GetSupportedScaleFactor(999.0f));
 }
 
-TEST(LayoutTest, GetMaxScaleFactor) {
+TEST(LayoutTest, GetMaxSupportedScaleFactor) {
 #if defined(OS_CHROMEOS)
   // On Chrome OS, the maximum scale factor is based on
   // the available resource pack. In testing environment,
   // we always have 200P.
-  EXPECT_EQ(SCALE_FACTOR_200P, GetMaxScaleFactor());
+  EXPECT_EQ(SCALE_FACTOR_200P, GetMaxSupportedScaleFactor());
 #else
   {
     ScaleFactor scale_factors[] = { SCALE_FACTOR_100P };
     std::vector<ScaleFactor> supported_factors(
         scale_factors, scale_factors + arraysize(scale_factors));
     test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
-    EXPECT_EQ(SCALE_FACTOR_100P, GetMaxScaleFactor());
+    EXPECT_EQ(SCALE_FACTOR_100P, GetMaxSupportedScaleFactor());
   }
 
   {
@@ -84,7 +84,7 @@ TEST(LayoutTest, GetMaxScaleFactor) {
     std::vector<ScaleFactor> supported_factors(
         scale_factors, scale_factors + arraysize(scale_factors));
     test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
-    EXPECT_EQ(SCALE_FACTOR_140P, GetMaxScaleFactor());
+    EXPECT_EQ(SCALE_FACTOR_140P, GetMaxSupportedScaleFactor());
   }
 
   {
@@ -95,7 +95,7 @@ TEST(LayoutTest, GetMaxScaleFactor) {
     std::vector<ScaleFactor> supported_factors(
         scale_factors, scale_factors + arraysize(scale_factors));
     test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors);
-    EXPECT_EQ(SCALE_FACTOR_200P, GetMaxScaleFactor());
+    EXPECT_EQ(SCALE_FACTOR_200P, GetMaxSupportedScaleFactor());
   }
 #endif
 }