Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / wm / ash_native_cursor_manager_unittest.cc

diff --git a/src/ash/wm/ash_native_cursor_manager_unittest.cc b/src/ash/wm/ash_native_cursor_manager_unittest.cc
index 4d746f8..66817f5 100644 (file)
--- a/src/ash/wm/ash_native_cursor_manager_unittest.cc
+++ b/src/ash/wm/ash_native_cursor_manager_unittest.cc
@@ -23,8 +23,8 @@
 #endif
 
 #if defined(USE_X11)
-#include "grit/ui_resources.h"
 #include "ui/base/cursor/cursor_loader_x11.h"
+#include "ui/resources/grit/ui_resources.h"
 #endif
 
 namespace ash {
@@ -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,