Change ui cursor identifiers to an enum class.

ash/display/mirror_window_controller_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 "ash/display/mirror_window_controller.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
@@ skipping 59 matching lines @@
   EXPECT_TRUE(test_api.GetCursorWindow());
   EXPECT_EQ("50,50 100x100", window->bounds().ToString());
 
   ui::test::EventGenerator generator(root);
   generator.MoveMouseTo(10, 10);
 
   // Test if cursor movement is propertly reflected in mirror window.
   EXPECT_EQ("4,4", test_api.GetCursorHotPoint().ToString());
   EXPECT_EQ("10,10",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
-  EXPECT_EQ(ui::kCursorNull, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, test_api.GetCurrentCursorType());
   EXPECT_TRUE(test_api.GetCursorWindow()->IsVisible());
 
   // Test if cursor type change is propertly reflected in mirror window.
   generator.MoveMouseTo(100, 100);
   EXPECT_EQ("100,100",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
-  EXPECT_EQ(ui::kCursorNorthResize, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNorthResize, test_api.GetCurrentCursorType());
 
   // Test if visibility change is propertly reflected in mirror window.
   // A key event hides cursor.
   generator.PressKey(ui::VKEY_A, 0);
   generator.ReleaseKey(ui::VKEY_A, 0);
   EXPECT_FALSE(test_api.GetCursorWindow()->IsVisible());
 
   // Mouse event makes it visible again.
   generator.MoveMouseTo(300, 300);
   EXPECT_EQ("300,300",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
-  EXPECT_EQ(ui::kCursorNull, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, test_api.GetCurrentCursorType());
   EXPECT_TRUE(test_api.GetCursorWindow()->IsVisible());
 }
 
 TEST_F(MirrorWindowControllerTest, MirrorCursorRotate) {
   test::MirrorWindowTestApi test_api;
   aura::test::TestWindowDelegate test_window_delegate;
   test_window_delegate.set_window_component(HTTOP);
 
   display_manager()->SetMultiDisplayMode(display::DisplayManager::MIRRORING);
   UpdateDisplay("400x400,400x400");
   aura::Window* root = Shell::Get()->GetPrimaryRootWindow();
   std::unique_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
       &test_window_delegate, 0, gfx::Rect(50, 50, 100, 100), root));
   window->Show();
   window->SetName("foo");
 
   EXPECT_TRUE(test_api.GetCursorWindow());
   EXPECT_EQ("50,50 100x100", window->bounds().ToString());
 
   ui::test::EventGenerator generator(root);
   generator.MoveMouseToInHost(100, 100);
 
   // Test if cursor movement is propertly reflected in mirror window.
   EXPECT_EQ("11,12", test_api.GetCursorHotPoint().ToString());
   EXPECT_EQ("100,100",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
-  EXPECT_EQ(ui::kCursorNorthResize, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNorthResize, test_api.GetCurrentCursorType());
 
   UpdateDisplay("400x400/r,400x400");  // 90 degrees.
   generator.MoveMouseToInHost(300, 100);
-  EXPECT_EQ(ui::kCursorNorthResize, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNorthResize, test_api.GetCurrentCursorType());
   // The size of cursor image is 25x25, so the rotated hot point must
   // be (25-12, 11).
   EXPECT_EQ("13,11", test_api.GetCursorHotPoint().ToString());
   EXPECT_EQ("300,100",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
 
   UpdateDisplay("400x400/u,400x400");  // 180 degrees.
   generator.MoveMouseToInHost(300, 300);
-  EXPECT_EQ(ui::kCursorNorthResize, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNorthResize, test_api.GetCurrentCursorType());
   // Rotated hot point must be (25-11, 25-12).
   EXPECT_EQ("14,13", test_api.GetCursorHotPoint().ToString());
   EXPECT_EQ("300,300",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
 
   UpdateDisplay("400x400/l,400x400");  // 270 degrees.
   generator.MoveMouseToInHost(100, 300);
-  EXPECT_EQ(ui::kCursorNorthResize, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNorthResize, test_api.GetCurrentCursorType());
   // Rotated hot point must be (12, 25-11).
   EXPECT_EQ("12,14", test_api.GetCursorHotPoint().ToString());
   EXPECT_EQ("100,300",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
 }
 
 // Make sure that the mirror cursor's location is same as
 // the source display's host location in the mirror root window's
 // coordinates.
 TEST_F(MirrorWindowControllerTest, MirrorCursorLocations) {
@@ skipping 60 matching lines @@
   // because the cursor's previous position is out of bounds.
   // Check real cursor's position and properties.
   EXPECT_EQ("100,100", env->last_mouse_location().ToString());
   EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
   EXPECT_EQ(display::Display::ROTATE_90,
             cursor_test_api.GetCurrentCursorRotation());
 
   // Check mirrored cursor's location.
   test::MirrorWindowTestApi test_api;
   // The hot point location depends on the specific cursor.
-  EXPECT_EQ(ui::kCursorNull, test_api.GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, test_api.GetCurrentCursorType());
   // Rotated hot point must be (25-7, 7).
   EXPECT_EQ("18,7", test_api.GetCursorHotPoint().ToString());
   // New coordinates are not (200,200) because (200,200) is not the center of
   // the display.
   EXPECT_EQ("199,200",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
 }
 
 // Make sure that the compositor based mirroring can switch
 // from/to dock mode.
@@ skipping 42 matching lines @@
 }
 
 TEST_F(MirrorOnBootTest, MirrorOnBoot) {
   EXPECT_TRUE(display_manager()->IsInMirrorMode());
   RunAllPendingInMessageLoop();
   test::MirrorWindowTestApi test_api;
   EXPECT_TRUE(test_api.GetHost());
 }
 
 }  // namespace ash