Change ui cursor identifiers to an enum class.

ui/views/widget/desktop_aura/desktop_native_widget_aura_unittest.cc

 // Copyright 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/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 160 matching lines @@
   EXPECT_FALSE(cursor_client_b->IsMouseEventsEnabled());
 
   cursor_client_a->EnableMouseEvents();
   EXPECT_TRUE(cursor_client_a->IsCursorVisible());
   EXPECT_TRUE(cursor_client_b->IsCursorVisible());
   EXPECT_TRUE(cursor_client_a->IsMouseEventsEnabled());
   EXPECT_TRUE(cursor_client_b->IsMouseEventsEnabled());
 
   // Verify that setting the cursor using one cursor client
   // will set it for all root windows.
-  EXPECT_EQ(ui::kCursorNone, cursor_client_a->GetCursor().native_type());
-  EXPECT_EQ(ui::kCursorNone, cursor_client_b->GetCursor().native_type());
+  EXPECT_EQ(ui::CursorType::kNone, cursor_client_a->GetCursor().native_type());
+  EXPECT_EQ(ui::CursorType::kNone, cursor_client_b->GetCursor().native_type());
 
-  cursor_client_b->SetCursor(ui::kCursorPointer);
-  EXPECT_EQ(ui::kCursorPointer, cursor_client_a->GetCursor().native_type());
-  EXPECT_EQ(ui::kCursorPointer, cursor_client_b->GetCursor().native_type());
+  cursor_client_b->SetCursor(ui::CursorType::kPointer);
+  EXPECT_EQ(ui::CursorType::kPointer,
+            cursor_client_a->GetCursor().native_type());
+  EXPECT_EQ(ui::CursorType::kPointer,
+            cursor_client_b->GetCursor().native_type());
 
   // Verify that hiding the cursor using one cursor client will
   // hide it for all root windows. Note that hiding the cursor
   // should not disable mouse events.
   cursor_client_a->HideCursor();
   EXPECT_FALSE(cursor_client_a->IsCursorVisible());
   EXPECT_FALSE(cursor_client_b->IsCursorVisible());
   EXPECT_TRUE(cursor_client_a->IsMouseEventsEnabled());
   EXPECT_TRUE(cursor_client_b->IsMouseEventsEnabled());
 
@@ skipping 477 matching lines @@
   target->HandleKeyboardMessage(WM_CHAR, 0, 0, &handled);
   target->HandleKeyboardMessage(WM_SYSCHAR, 0, 0, &handled);
   target->HandleKeyboardMessage(WM_SYSDEADCHAR, 0, 0, &handled);
   widget.CloseNow();
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace test
 }  // namespace views