Change ui cursor identifiers to an enum class.

ui/aura/test/test_cursor_client.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/aura/test/test_cursor_client.h"
 
 #include "ui/aura/client/cursor_client_observer.h"
 
 namespace aura {
 namespace test {
@@ skipping 10 matching lines @@
 
 TestCursorClient::~TestCursorClient() {
   client::SetCursorClient(root_window_, NULL);
 }
 
 void TestCursorClient::SetCursor(gfx::NativeCursor cursor) {
   calls_to_set_cursor_++;
 }
 
 gfx::NativeCursor TestCursorClient::GetCursor() const {
-  return ui::kCursorNull;
+  return ui::CursorType::kNull;
 }
 
 void TestCursorClient::ShowCursor() {
   visible_ = true;
   for (aura::client::CursorClientObserver& observer : observers_)
     observer.OnCursorVisibilityChanged(true);
 }
 
 void TestCursorClient::HideCursor() {
   visible_ = false;
@@ skipping 50 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 bool TestCursorClient::ShouldHideCursorOnKeyEvent(
     const ui::KeyEvent& event) const {
   return should_hide_cursor_on_key_event_;
 }
 
 }  // namespace test
 }  // namespace aura