Index: ash/display/cursor_window_controller_unittest.cc |
diff --git a/ash/display/cursor_window_controller_unittest.cc b/ash/display/cursor_window_controller_unittest.cc |
index 3609b643ee044090d57b26c1a09c46c1bfec3b6a..d7460a67616dd287db994d0de42f6c68e930486a 100644 |
--- a/ash/display/cursor_window_controller_unittest.cc |
+++ b/ash/display/cursor_window_controller_unittest.cc |
@@ -30,7 +30,9 @@ class CursorWindowControllerTest : public test::AshTestBase { |
SetCursorCompositionEnabled(true); |
} |
- int GetCursorType() const { return cursor_window_controller_->cursor_type_; } |
+ ui::CursorType GetCursorType() const { |
+ return cursor_window_controller_->cursor_type_; |
+ } |
const gfx::Point& GetCursorHotPoint() const { |
return cursor_window_controller_->hot_point_; |
@@ -80,7 +82,7 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) { |
EXPECT_TRUE(primary_root->Contains(GetCursorWindow())); |
EXPECT_EQ(primary_display_id, GetCursorDisplayId()); |
- EXPECT_EQ(ui::kCursorNull, GetCursorType()); |
+ EXPECT_EQ(ui::CursorType::kNull, GetCursorType()); |
gfx::Point hot_point = GetCursorHotPoint(); |
EXPECT_EQ("4,4", hot_point.ToString()); |
gfx::Rect cursor_bounds = GetCursorWindow()->GetBoundsInScreen(); |
@@ -104,7 +106,7 @@ TEST_F(CursorWindowControllerTest, MoveToDifferentDisplay) { |
EXPECT_TRUE(secondary_root->Contains(GetCursorWindow())); |
EXPECT_EQ(secondary_display_id, GetCursorDisplayId()); |
- EXPECT_EQ(ui::kCursorNull, GetCursorType()); |
+ EXPECT_EQ(ui::CursorType::kNull, GetCursorType()); |
hot_point = GetCursorHotPoint(); |
EXPECT_EQ("3,3", hot_point.ToString()); |
cursor_bounds = GetCursorWindow()->GetBoundsInScreen(); |