| Index: ash/wm/ash_native_cursor_manager_unittest.cc
|
| diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc
|
| index 695a965872b9c7c03940a27aa3884987ba0d0fd1..66817f57c08f3a4f081dc56aa0e5846926f4971b 100644
|
| --- a/ash/wm/ash_native_cursor_manager_unittest.cc
|
| +++ b/ash/wm/ash_native_cursor_manager_unittest.cc
|
| @@ -165,7 +165,6 @@ TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
|
| CursorManagerTestApi test_api(cursor_manager);
|
| DisplayManager* display_manager = Shell::GetInstance()->display_manager();
|
|
|
| - DisplayInfo::SetAllowUpgradeToHighDPI(false);
|
| display_manager->SetDisplayUIScale(display_id, 0.5f);
|
| EXPECT_EQ(1.0f,
|
| Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
|
| @@ -173,13 +172,6 @@ TEST_F(AshNativeCursorManagerTest, UIScaleShouldNotChangeCursor) {
|
|
|
| display_manager->SetDisplayUIScale(display_id, 1.0f);
|
|
|
| - DisplayInfo::SetAllowUpgradeToHighDPI(true);
|
| - // 1x display should keep using 1x cursor even if the DSF is upgraded to 2x.
|
| - display_manager->SetDisplayUIScale(display_id, 0.5f);
|
| - EXPECT_EQ(2.0f,
|
| - Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
|
| - EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
|
| -
|
| // 2x display should keep using 2x cursor regardless of the UI scale.
|
| UpdateDisplay("800x800*2");
|
| EXPECT_EQ(2.0f,
|
|
|