Upstream version 7.36.149.0

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

diff --git a/src/ash/wm/ash_native_cursor_manager_interactive_uitest.cc b/src/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
index 771b725..83df158 100644 (file)
--- a/src/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
+++ b/src/ash/wm/ash_native_cursor_manager_interactive_uitest.cc
@@ -20,13 +20,11 @@
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
-#include "base/message_loop/message_pump_x11.h"
+#include "ui/gfx/x/x11_types.h"
 #endif
 
 namespace ash {
 
-using ::wm::CursorManager;
-
 class AshNativeCursorManagerTest : public test::AshTestBase {
  public:
   AshNativeCursorManagerTest() {}
@@ -50,10 +48,10 @@ class AshNativeCursorManagerTest : public test::AshTestBase {
 
 namespace {
 
-internal::DisplayInfo CreateDisplayInfo(int64 id,
-                                        const gfx::Rect& bounds,
-                                        float device_scale_factor) {
-  internal::DisplayInfo info(id, "", false);
+DisplayInfo CreateDisplayInfo(int64 id,
+                              const gfx::Rect& bounds,
+                              float device_scale_factor) {
+  DisplayInfo info(id, "", false);
   info.SetBounds(bounds);
   info.set_device_scale_factor(device_scale_factor);
   return info;
@@ -61,7 +59,7 @@ internal::DisplayInfo CreateDisplayInfo(int64 id,
 
 void MoveMouseSync(aura::Window* window, int x, int y) {
 #if defined(USE_X11)
-  XWarpPointer(base::MessagePumpX11::GetDefaultXDisplay(),
+  XWarpPointer(gfx::GetXDisplay(),
                None,
                window->GetHost()->GetAcceleratedWidget(),
                0, 0, 0, 0,
@@ -90,25 +88,24 @@ void MoveMouseSync(aura::Window* window, int x, int y) {
 #endif
 
 TEST_F(AshNativeCursorManagerTest, MAYBE_CursorChangeOnEnterNotify) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
+  ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   test::CursorManagerTestApi test_api(cursor_manager);
 
-  internal::DisplayManager* display_manager =
-      Shell::GetInstance()->display_manager();
-  internal::DisplayInfo display_info1 =
+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  DisplayInfo display_info1 =
       CreateDisplayInfo(10, gfx::Rect(0, 0, 500, 300), 1.0f);
-  internal::DisplayInfo display_info2 =
+  DisplayInfo display_info2 =
       CreateDisplayInfo(20, gfx::Rect(500, 0, 500, 300), 2.0f);
-  std::vector<internal::DisplayInfo> display_info_list;
+  std::vector<DisplayInfo> display_info_list;
   display_info_list.push_back(display_info1);
   display_info_list.push_back(display_info2);
   display_manager->OnNativeDisplaysChanged(display_info_list);
 
   MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10);
-  EXPECT_EQ(1.0f, test_api.GetDisplay().device_scale_factor());
+  EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 
   MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10);
-  EXPECT_EQ(2.0f, test_api.GetDisplay().device_scale_factor());
+  EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
 
 }  // namespace ash