mus: Rename mojom::Cursor to mojom::CursorType.

services/ui/ws/test_utils.h

Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index bf623d6936fc27a1bf1a6f1585879eb5519e1e94..afa12e82528abbacb941e39da5a8807ae1a6b4f1 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -142,7 +142,7 @@ class DisplayTestApi {
 
   void OnEvent(ui::Event* event) { display_->OnEventFromSource(event); }
 
-  mojom::Cursor last_cursor() const { return display_->last_cursor_; }
+  mojom::CursorType last_cursor() const { return display_->last_cursor_; }
 
  private:
   Display* display_;
@@ -275,7 +275,7 @@ class TestDisplayBinding : public DisplayBinding {
 // Factory that dispenses TestPlatformDisplays.
 class TestPlatformDisplayFactory : public PlatformDisplayFactory {
  public:
-  explicit TestPlatformDisplayFactory(mojom::Cursor* cursor_storage);
+  explicit TestPlatformDisplayFactory(mojom::CursorType* cursor_storage);
   ~TestPlatformDisplayFactory();
 
   // PlatformDisplayFactory:
@@ -284,7 +284,7 @@ class TestPlatformDisplayFactory : public PlatformDisplayFactory {
       const display::ViewportMetrics& metrics) override;
 
  private:
-  mojom::Cursor* cursor_storage_;
+  mojom::CursorType* cursor_storage_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplayFactory);
 };
@@ -459,7 +459,7 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
                               int64_t display_id) override;
   void OnWindowFocused(uint32_t focused_window_id) override;
   void OnWindowPredefinedCursorChanged(uint32_t window_id,
-                                       mojom::Cursor cursor_id) override;
+                                       mojom::CursorType cursor_id) override;
   void OnWindowSurfaceChanged(Id window_id,
                               const cc::SurfaceInfo& surface_info) override;
   void OnDragDropStart(
@@ -590,14 +590,14 @@ class WindowServerTestHelper {
   ~WindowServerTestHelper();
 
   WindowServer* window_server() { return window_server_.get(); }
-  mojom::Cursor cursor() const { return cursor_id_; }
+  mojom::CursorType cursor() const { return cursor_id_; }
 
   TestWindowServerDelegate* window_server_delegate() {
     return &window_server_delegate_;
   }
 
  private:
-  mojom::Cursor cursor_id_;
+  mojom::CursorType cursor_id_;
   TestPlatformDisplayFactory platform_display_factory_;
   TestWindowServerDelegate window_server_delegate_;
   std::unique_ptr<WindowServer> window_server_;
@@ -632,7 +632,7 @@ class WindowEventTargetingHelper {
   // Sets the task runner for |message_loop_|
   void SetTaskRunner(scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
-  mojom::Cursor cursor() const { return ws_test_helper_.cursor(); }
+  mojom::CursorType cursor() const { return ws_test_helper_.cursor(); }
   Display* display() { return display_; }
   TestWindowTreeBinding* last_binding() {
     return ws_test_helper_.window_server_delegate()->last_binding();