| Index: ui/base/layout_unittest.cc
|
| diff --git a/ui/base/layout_unittest.cc b/ui/base/layout_unittest.cc
|
| index 4878e12529cc247e14ab0afd53d98c7d676c9b08..0bff818c4418a00f9ecd27a6666f9bc2c225dd44 100644
|
| --- a/ui/base/layout_unittest.cc
|
| +++ b/ui/base/layout_unittest.cc
|
| @@ -72,12 +72,10 @@ TEST(LayoutTest, GetScaleFactorFromScaleAllSupported) {
|
|
|
| TEST(LayoutTest, GetMaxScaleFactor) {
|
| #if defined(OS_CHROMEOS)
|
| - // On Chrome OS, the maximum scale factor differs depending on the devices and
|
| - // force-device-scale-factor flag. Tests only the cases not affected by these.
|
| - if (!base::chromeos::IsRunningOnChromeOS() &&
|
| - !CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kForceDeviceScaleFactor))
|
| - EXPECT_EQ(SCALE_FACTOR_100P, GetMaxScaleFactor());
|
| + // 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());
|
| #else
|
| {
|
| ScaleFactor scale_factors[] = { SCALE_FACTOR_100P };
|
|
|