| Index: ash/display/display_info_unittest.cc
|
| diff --git a/ash/display/display_info_unittest.cc b/ash/display/display_info_unittest.cc
|
| index 7c5da69f402c3c91fdad9306c7acdc75f36a7707..7f29d042ebad5a7211d4fbfd523032416087ce0a 100644
|
| --- a/ash/display/display_info_unittest.cc
|
| +++ b/ash/display/display_info_unittest.cc
|
| @@ -110,23 +110,19 @@ TEST_F(DisplayInfoTest, DisplayModeGetSizeInDIPHiDPI) {
|
| }
|
|
|
| TEST_F(DisplayInfoTest, DisplayModeGetSizeInDIP125) {
|
| - DisplayInfo::SetUse125DSFForUIScaling(true);
|
| gfx::Size size(1920, 1080);
|
| EXPECT_EQ("2400x1350", GetModeSizeInDIP(size, 1.25f, 1.25f, true));
|
| EXPECT_EQ("1920x1080", GetModeSizeInDIP(size, 1.25f, 1.0f, true));
|
| EXPECT_EQ("1536x864", GetModeSizeInDIP(size, 1.25f, 0.8f, true));
|
| EXPECT_EQ("1200x675", GetModeSizeInDIP(size, 1.25f, 0.625f, true));
|
| EXPECT_EQ("960x540", GetModeSizeInDIP(size, 1.25f, 0.5f, true));
|
| - DisplayInfo::SetUse125DSFForUIScaling(false);
|
| }
|
|
|
| TEST_F(DisplayInfoTest, DisplayModeGetSizeForExternal4K) {
|
| - DisplayInfo::SetUse125DSFForUIScaling(true);
|
| gfx::Size size(3840, 2160);
|
| EXPECT_EQ("1920x1080", GetModeSizeInDIP(size, 2.0f, 1.0f, false));
|
| EXPECT_EQ("3072x1728", GetModeSizeInDIP(size, 1.25f, 1.0f, false));
|
| EXPECT_EQ("3840x2160", GetModeSizeInDIP(size, 1.0f, 1.0f, false));
|
| - DisplayInfo::SetUse125DSFForUIScaling(false);
|
| }
|
|
|
| } // namespace ash
|
|
|