| Index: ash/wm/window_manager_unittest.cc
|
| diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
|
| index 9d164a5b6b693ee8eda4c7ae94fc29cbc5d8417a..7bb1e5618537a8631804a77d7283c3a7960f39d6 100644
|
| --- a/ash/wm/window_manager_unittest.cc
|
| +++ b/ash/wm/window_manager_unittest.cc
|
| @@ -859,11 +859,11 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) {
|
| EXPECT_FALSE(observer_b.is_cursor_visible());
|
|
|
| // Set cursor set.
|
| - cursor_manager->SetCursorSet(ui::CURSOR_SET_LARGE);
|
| + cursor_manager->SetCursorSet(ui::CursorSet::kLarge);
|
| EXPECT_TRUE(observer_a.did_cursor_set_change());
|
| - EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_a.cursor_set());
|
| + EXPECT_EQ(ui::CursorSet::kLarge, observer_a.cursor_set());
|
| EXPECT_TRUE(observer_b.did_cursor_set_change());
|
| - EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_b.cursor_set());
|
| + EXPECT_EQ(ui::CursorSet::kLarge, observer_b.cursor_set());
|
|
|
| // Mouse move should show the cursor.
|
| observer_a.reset();
|
| @@ -887,9 +887,9 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) {
|
| EXPECT_FALSE(observer_a.is_cursor_visible());
|
|
|
| // Set back cursor set to normal.
|
| - cursor_manager->SetCursorSet(ui::CURSOR_SET_NORMAL);
|
| + cursor_manager->SetCursorSet(ui::CursorSet::kNormal);
|
| EXPECT_TRUE(observer_a.did_cursor_set_change());
|
| - EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer_a.cursor_set());
|
| + EXPECT_EQ(ui::CursorSet::kNormal, observer_a.cursor_set());
|
| EXPECT_FALSE(observer_b.did_cursor_set_change());
|
|
|
| // Mouse move should show the cursor.
|
|
|