Make the cursor have separate mode for disabled mouse events and invisible.

ash/wm/window_manager_unittest.cc

Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index 98568e4189b8a3d90593220f00642bf7cb00dde5..23ebd1a5d216ecd975dea65dede10bbccd4bf00e 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -663,9 +663,9 @@ TEST_F(WindowManagerTest, UpdateCursorVisibility) {
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_released1);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
 
-  // If someone else made cursor invisible keep it invisible even after it
+  // If someone else made cursor disabled keep it invisible even after it
   // received mouse events.
-  cursor_manager->ShowCursor(false);
+  cursor_manager->EnableCursor(false);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_FALSE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
@@ -676,7 +676,7 @@ TEST_F(WindowManagerTest, UpdateCursorVisibility) {
   EXPECT_FALSE(cursor_manager->IsCursorVisible());
 
   // Back to normal.
-  cursor_manager->ShowCursor(true);
+  cursor_manager->EnableCursor(true);
   root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
   EXPECT_TRUE(cursor_manager->IsCursorVisible());
   root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);