Change ui cursor identifiers to an enum class.

ash/extended_desktop_unittest.cc

 // Copyright (c) 2012 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 "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_finder.h"
@@ skipping 238 matching lines @@
   event_generator.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(widget_on_1st->GetNativeView()));
   EXPECT_EQ(root_windows[0], Shell::GetRootWindowForNewWindows());
 }
 
 TEST_F(ExtendedDesktopTest, TestCursor) {
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::WindowTreeHost* host0 = root_windows[0]->GetHost();
   aura::WindowTreeHost* host1 = root_windows[1]->GetHost();
-  EXPECT_EQ(ui::kCursorPointer, host0->last_cursor().native_type());
-  EXPECT_EQ(ui::kCursorNull, host1->last_cursor().native_type());
-  Shell::Get()->cursor_manager()->SetCursor(ui::kCursorCopy);
-  EXPECT_EQ(ui::kCursorCopy, host0->last_cursor().native_type());
-  EXPECT_EQ(ui::kCursorCopy, host1->last_cursor().native_type());
+  EXPECT_EQ(ui::CursorType::kPointer, host0->last_cursor().native_type());
+  EXPECT_EQ(ui::CursorType::kNull, host1->last_cursor().native_type());
+  Shell::Get()->cursor_manager()->SetCursor(ui::CursorType::kCopy);
+  EXPECT_EQ(ui::CursorType::kCopy, host0->last_cursor().native_type());
+  EXPECT_EQ(ui::CursorType::kCopy, host1->last_cursor().native_type());
 }
 
 TEST_F(ExtendedDesktopTest, TestCursorLocation) {
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::test::WindowTestApi root_window0_test_api(root_windows[0]);
   aura::test::WindowTestApi root_window1_test_api(root_windows[1]);
 
   root_windows[0]->MoveCursorTo(gfx::Point(10, 10));
   EXPECT_EQ("10,10",
@@ skipping 579 matching lines @@
   generator.ReleaseLeftButton();
   EXPECT_EQ("-999,-999 -999,-999", event_handler.GetLocationsAndReset());
 
   generator.MoveMouseTo(400, 150);
   EXPECT_EQ("100,150 100,150", event_handler.GetLocationsAndReset());
 
   ash::Shell::Get()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace ash