Implement large cursors in Mushrome.

ash/wm/native_cursor_manager_ash_unittest.cc

Index: ash/wm/native_cursor_manager_ash_unittest.cc
diff --git a/ash/wm/native_cursor_manager_ash_unittest.cc b/ash/wm/native_cursor_manager_ash_unittest.cc
index edd46710152a09c0db7d27db8d27a6eb40bf6ae7..b896c1a7e61a7a751b6177af55d83105ca64ae08 100644
--- a/ash/wm/native_cursor_manager_ash_unittest.cc
+++ b/ash/wm/native_cursor_manager_ash_unittest.cc
@@ -63,7 +63,7 @@ TEST_F(NativeCursorManagerAshTest, LockCursor) {
   EXPECT_EQ(ui::CursorType::kCopy, test_api.GetCurrentCursor().native_type());
   UpdateDisplay("800x800*2/r");
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
   EXPECT_EQ(display::Display::ROTATE_90, test_api.GetCurrentCursorRotation());
   EXPECT_TRUE(test_api.GetCurrentCursor().platform());
 
@@ -71,13 +71,13 @@ TEST_F(NativeCursorManagerAshTest, LockCursor) {
   EXPECT_TRUE(cursor_manager->IsCursorLocked());
 
   // Cursor type does not change while cursor is locked.
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
-  cursor_manager->SetCursorSet(ui::CURSOR_SET_NORMAL);
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
-  cursor_manager->SetCursorSet(ui::CURSOR_SET_LARGE);
-  EXPECT_EQ(ui::CURSOR_SET_LARGE, test_api.GetCurrentCursorSet());
-  cursor_manager->SetCursorSet(ui::CURSOR_SET_NORMAL);
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
+  cursor_manager->SetCursorSet(ui::CursorSet::kNormal);
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
+  cursor_manager->SetCursorSet(ui::CursorSet::kLarge);
+  EXPECT_EQ(ui::CursorSet::kLarge, test_api.GetCurrentCursorSet());
+  cursor_manager->SetCursorSet(ui::CursorSet::kNormal);
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
 
   // Cursor type does not change while cursor is locked.
   cursor_manager->SetCursor(ui::CursorType::kPointer);
@@ -114,16 +114,16 @@ TEST_F(NativeCursorManagerAshTest, SetCursorSet) {
   ::wm::CursorManager* cursor_manager = Shell::Get()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
 
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
 
-  cursor_manager->SetCursorSet(ui::CURSOR_SET_NORMAL);
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
+  cursor_manager->SetCursorSet(ui::CursorSet::kNormal);
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
 
-  cursor_manager->SetCursorSet(ui::CURSOR_SET_LARGE);
-  EXPECT_EQ(ui::CURSOR_SET_LARGE, test_api.GetCurrentCursorSet());
+  cursor_manager->SetCursorSet(ui::CursorSet::kLarge);
+  EXPECT_EQ(ui::CursorSet::kLarge, test_api.GetCurrentCursorSet());
 
-  cursor_manager->SetCursorSet(ui::CURSOR_SET_NORMAL);
-  EXPECT_EQ(ui::CURSOR_SET_NORMAL, test_api.GetCurrentCursorSet());
+  cursor_manager->SetCursorSet(ui::CursorSet::kNormal);
+  EXPECT_EQ(ui::CursorSet::kNormal, test_api.GetCurrentCursorSet());
 }
 
 TEST_F(NativeCursorManagerAshTest, SetDeviceScaleFactorAndRotation) {