| Index: ash/wm/cursor_manager_unittest.cc
|
| diff --git a/ash/wm/cursor_manager_unittest.cc b/ash/wm/cursor_manager_unittest.cc
|
| index d997b30f80022bff27ce5bd41edbb3cec165d0c9..7d8286446a184a722d75383113fc801c465b751d 100644
|
| --- a/ash/wm/cursor_manager_unittest.cc
|
| +++ b/ash/wm/cursor_manager_unittest.cc
|
| @@ -64,48 +64,48 @@ TEST_F(CursorManagerTest, ShowCursor) {
|
| EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
|
|
|
| cursor_manager->ShowCursor(true);
|
| - EXPECT_TRUE(cursor_manager->cursor_visible());
|
| + EXPECT_TRUE(cursor_manager->IsCursorVisible());
|
| cursor_manager->ShowCursor(false);
|
| - EXPECT_FALSE(cursor_manager->cursor_visible());
|
| + EXPECT_FALSE(cursor_manager->IsCursorVisible());
|
| // The current cursor does not change even when the cursor is not shown.
|
| EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
|
|
|
| // Check if cursor visibility is locked.
|
| cursor_manager->LockCursor();
|
| - EXPECT_FALSE(cursor_manager->cursor_visible());
|
| + EXPECT_FALSE(cursor_manager->IsCursorVisible());
|
| cursor_manager->ShowCursor(true);
|
| - EXPECT_FALSE(cursor_manager->cursor_visible());
|
| + EXPECT_FALSE(cursor_manager->IsCursorVisible());
|
| cursor_manager->UnlockCursor();
|
| - EXPECT_TRUE(cursor_manager->cursor_visible());
|
| + EXPECT_TRUE(cursor_manager->IsCursorVisible());
|
|
|
| cursor_manager->LockCursor();
|
| - EXPECT_TRUE(cursor_manager->cursor_visible());
|
| + EXPECT_TRUE(cursor_manager->IsCursorVisible());
|
| cursor_manager->ShowCursor(false);
|
| - EXPECT_TRUE(cursor_manager->cursor_visible());
|
| + EXPECT_TRUE(cursor_manager->IsCursorVisible());
|
| cursor_manager->UnlockCursor();
|
| - EXPECT_FALSE(cursor_manager->cursor_visible());
|
| + EXPECT_FALSE(cursor_manager->IsCursorVisible());
|
|
|
| // Checks setting visiblity while cursor is locked does not affect the
|
| // subsequent uses of UnlockCursor.
|
| cursor_manager->LockCursor();
|
| cursor_manager->ShowCursor(false);
|
| cursor_manager->UnlockCursor();
|
| - EXPECT_FALSE(cursor_manager->cursor_visible());
|
| + EXPECT_FALSE(cursor_manager->IsCursorVisible());
|
|
|
| cursor_manager->ShowCursor(true);
|
| cursor_manager->LockCursor();
|
| cursor_manager->UnlockCursor();
|
| - EXPECT_TRUE(cursor_manager->cursor_visible());
|
| + EXPECT_TRUE(cursor_manager->IsCursorVisible());
|
|
|
| cursor_manager->LockCursor();
|
| cursor_manager->ShowCursor(true);
|
| cursor_manager->UnlockCursor();
|
| - EXPECT_TRUE(cursor_manager->cursor_visible());
|
| + EXPECT_TRUE(cursor_manager->IsCursorVisible());
|
|
|
| cursor_manager->ShowCursor(false);
|
| cursor_manager->LockCursor();
|
| cursor_manager->UnlockCursor();
|
| - EXPECT_FALSE(cursor_manager->cursor_visible());
|
| + EXPECT_FALSE(cursor_manager->IsCursorVisible());
|
| }
|
|
|
| TEST_F(CursorManagerTest, SetDeviceScaleFactor) {
|
|
|