Change ui cursor identifiers to an enum class.

services/ui/public/interfaces/cursor/cursor_struct_traits_unittest.cc

 // Copyright 2017 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 "services/ui/public/interfaces/cursor/cursor_struct_traits.h"
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/common/common_custom_types_struct_traits.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/ui/public/interfaces/cursor/cursor.mojom.h"
@@ skipping 29 matching lines @@
     bitmap.allocN32Pixels(size.width(), size.height());
     bitmap.eraseColor(SK_ColorRED);
   }
   return frames;
 }
 
 }  // namespace
 
 // Tests numeric cursor ids.
 TEST_F(CursorStructTraitsTest, TestBuiltIn) {
   for (int i = 0; i < 43; ++i) {

[Tom Sepez, 2017/04/24 20:06:44]

nit: is there a symbolic constant for 43 we can use?

[Elliot Glaysher, 2017/04/25 17:16:45]

Done.

-    ui::CursorData input(i);
+    ui::CursorType type = static_cast<ui::CursorType>(i);
+    ui::CursorData input(type);
 
     ui::CursorData output;
     ASSERT_TRUE(EchoCursorData(input, &output));
-    EXPECT_TRUE(output.IsType(i));
+    EXPECT_TRUE(output.IsType(type));
   }
 }
 
 // Test that we copy cursor bitmaps and metadata across the wire.
 TEST_F(CursorStructTraitsTest, TestBitmapCursor) {
   const base::TimeDelta kFrameDelay = base::TimeDelta::FromMilliseconds(15);
   const gfx::Point kHotspot = gfx::Point(5, 2);
   const float kScale = 2.0f;
 
   ui::CursorData input(kHotspot, CreateTestCursorFrames(gfx::Size(10, 10), 3),
                        kScale, kFrameDelay);
 
   ui::CursorData output;
   ASSERT_TRUE(EchoCursorData(input, &output));
 
-  EXPECT_EQ(kCursorCustom, output.cursor_type());
+  EXPECT_EQ(CursorType::CUSTOM, output.cursor_type());
   EXPECT_EQ(kScale, output.scale_factor());
   EXPECT_EQ(kFrameDelay, output.frame_delay());
   EXPECT_EQ(kHotspot, output.hotspot_in_pixels());
 
   // Even if the pixel data is logically the same, expect that it has different
   // generation ids.
   EXPECT_FALSE(output.IsSameAs(input));
 
   // Make a copy of output. It should be the same as output.
   ui::CursorData copy = output;
@@ skipping 10 matching lines @@
     for (int x = 0; x < input.cursor_frames()[f].width(); ++x) {
       for (int y = 0; y < input.cursor_frames()[f].height(); ++y) {
         EXPECT_EQ(input.cursor_frames()[f].getColor(x, y),
                   output.cursor_frames()[f].getColor(x, y));
       }
     }
   }
 }
 
 }  // namespace ui