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..a57ee3c8f9a79f074445436ce667d1d7816a089e 100644
--- a/ui/base/layout_unittest.cc
+++ b/ui/base/layout_unittest.cc
@@ -63,19 +63,19 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
   EXPECT_EQ(SCALE_FACTOR_200P, GetScaleFactorFromScale(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
 }