| Index: ui/base/layout_unittest.cc
|
| diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc
|
| index b082beab72a8727a160ba805a41533689106f2df..310cd09bcc6b42a002151890cb276831ea192b1b 100644
|
| --- a/ui/base/layout_unittest.cc
|
| +++ b/ui/base/layout_unittest.cc
|
| @@ -14,14 +14,14 @@
|
| namespace ui {
|
|
|
| TEST(LayoutTest, GetScaleFactorScale) {
|
| - 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));
|
| - EXPECT_FLOAT_EQ(3.0f, GetImageScale(SCALE_FACTOR_300P));
|
| + EXPECT_FLOAT_EQ(1.0f, GetScaleForScaleFactor(SCALE_FACTOR_100P));
|
| + EXPECT_FLOAT_EQ(1.25f, GetScaleForScaleFactor(SCALE_FACTOR_125P));
|
| + EXPECT_FLOAT_EQ(1.33f, GetScaleForScaleFactor(SCALE_FACTOR_133P));
|
| + EXPECT_FLOAT_EQ(1.4f, GetScaleForScaleFactor(SCALE_FACTOR_140P));
|
| + EXPECT_FLOAT_EQ(1.5f, GetScaleForScaleFactor(SCALE_FACTOR_150P));
|
| + EXPECT_FLOAT_EQ(1.8f, GetScaleForScaleFactor(SCALE_FACTOR_180P));
|
| + EXPECT_FLOAT_EQ(2.0f, GetScaleForScaleFactor(SCALE_FACTOR_200P));
|
| + EXPECT_FLOAT_EQ(3.0f, GetScaleForScaleFactor(SCALE_FACTOR_300P));
|
| }
|
|
|
| TEST(LayoutTest, GetScaleFactorFromScalePartlySupported) {
|
|
|