diff options
Diffstat (limited to 'ash/wm/drag_window_resizer_unittest.cc')
-rw-r--r-- | ash/wm/drag_window_resizer_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc index 369a285..dbb4da0 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -494,13 +494,13 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) { // Grab (0, 0) of the window. scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer( window_.get(), gfx::Point(), HTCAPTION)); - EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor()); + EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor()); ASSERT_TRUE(resizer.get()); resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); WarpMouseCursorIfNecessary(root_windows[0], gfx::Point(399, 200)); - EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor()); + EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor()); resizer->CompleteDrag(); - EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor()); + EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor()); } // Move window from the root window with 2.0 device scale factor to the root @@ -518,13 +518,13 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) { // Grab (0, 0) of the window. scoped_ptr<WindowResizer> resizer(CreateDragWindowResizer( window_.get(), gfx::Point(), HTCAPTION)); - EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor()); + EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor()); ASSERT_TRUE(resizer.get()); resizer->Drag(CalculateDragPoint(*resizer, -200, 200), 0); WarpMouseCursorIfNecessary(root_windows[1], gfx::Point(400, 200)); - EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor()); + EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor()); resizer->CompleteDrag(); - EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor()); + EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor()); } } |