Change ui cursor identifiers to an enum class.

ui/wm/core/cursor_manager_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/wm/core/cursor_manager.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 36 matching lines @@
  protected:
   CursorManagerTest()
       : delegate_(new TestingCursorManager),
         cursor_manager_(base::WrapUnique(delegate_)) {}
 
   TestingCursorManager* delegate_;
   wm::CursorManager cursor_manager_;
 };
 
 TEST_F(CursorManagerTest, ShowHideCursor) {
-  cursor_manager_.SetCursor(ui::kCursorCopy);
-  EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+  cursor_manager_.SetCursor(ui::CursorType::kCopy);
+  EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
 
   cursor_manager_.ShowCursor();
   EXPECT_TRUE(cursor_manager_.IsCursorVisible());
   cursor_manager_.HideCursor();
   EXPECT_FALSE(cursor_manager_.IsCursorVisible());
   // The current cursor does not change even when the cursor is not shown.
-  EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+  EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
 
   // Check if cursor visibility is locked.
   cursor_manager_.LockCursor();
   EXPECT_FALSE(cursor_manager_.IsCursorVisible());
   cursor_manager_.ShowCursor();
   EXPECT_FALSE(cursor_manager_.IsCursorVisible());
   cursor_manager_.UnlockCursor();
   EXPECT_TRUE(cursor_manager_.IsCursorVisible());
 
   cursor_manager_.LockCursor();
@@ skipping 22 matching lines @@
 
   cursor_manager_.HideCursor();
   cursor_manager_.LockCursor();
   cursor_manager_.UnlockCursor();
   EXPECT_FALSE(cursor_manager_.IsCursorVisible());
 }
 
 // Verifies that LockCursor/UnlockCursor work correctly with
 // EnableMouseEvents and DisableMouseEvents
 TEST_F(CursorManagerTest, EnableDisableMouseEvents) {
-  cursor_manager_.SetCursor(ui::kCursorCopy);
-  EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+  cursor_manager_.SetCursor(ui::CursorType::kCopy);
+  EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
 
   cursor_manager_.EnableMouseEvents();
   EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
   cursor_manager_.DisableMouseEvents();
   EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
   // The current cursor does not change even when the cursor is not shown.
-  EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+  EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
 
   // Check if cursor enable state is locked.
   cursor_manager_.LockCursor();
   EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
   cursor_manager_.EnableMouseEvents();
   EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
   cursor_manager_.UnlockCursor();
   EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
 
   cursor_manager_.LockCursor();
@@ skipping 226 matching lines @@
   // This block validates that the cursor is visible initially. It then
   // performs normal cursor visibility operations.
   {
     wm::CursorManager cursor_manager3(
         base::WrapUnique(new TestingCursorManager));
     EXPECT_TRUE(cursor_manager3.IsCursorVisible());
     cursor_manager3.HideCursor();
     EXPECT_FALSE(cursor_manager3.IsCursorVisible());
   }
 }