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

services/ui/ws/window_tree_client_unittest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 219 matching lines @@
                          const std::string& name,
                          const std::vector<uint8_t>* data) {
     base::Optional<std::vector<uint8_t>> mojo_data;
     if (data)
       mojo_data.emplace(*data);
     const uint32_t change_id = GetAndAdvanceChangeId();
     tree()->SetWindowProperty(change_id, window_id, name, mojo_data);
     return WaitForChangeCompleted(change_id);
   }
 
-  bool SetPredefinedCursor(Id window_id, mojom::Cursor cursor) {
+  bool SetPredefinedCursor(Id window_id, mojom::CursorType cursor) {
     const uint32_t change_id = GetAndAdvanceChangeId();
     tree()->SetPredefinedCursor(change_id, window_id, cursor);
     return WaitForChangeCompleted(change_id);
   }
 
   bool SetWindowVisibility(Id window_id, bool visible) {
     const uint32_t change_id = GetAndAdvanceChangeId();
     tree()->SetWindowVisibility(change_id, window_id, visible);
     return WaitForChangeCompleted(change_id);
   }
@@ skipping 125 matching lines @@
                               int64_t display_id) override {}
   void OnWindowSharedPropertyChanged(
       uint32_t window,
       const std::string& name,
       const base::Optional<std::vector<uint8_t>>& new_data) override {
     tracker_.OnWindowSharedPropertyChanged(window, name, new_data);
   }
   // TODO(sky): add testing coverage.
   void OnWindowFocused(uint32_t focused_window_id) override {}
   void OnWindowPredefinedCursorChanged(uint32_t window_id,
-                                       mojom::Cursor cursor_id) override {
+                                       mojom::CursorType cursor_id) override {
     tracker_.OnWindowPredefinedCursorChanged(window_id, cursor_id);
   }
 
   void OnDragDropStart(
       const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data)
       override {
     NOTIMPLEMENTED();
   }
 
   void OnWindowSurfaceChanged(Id window_id,
@@ skipping 1227 matching lines @@
 }
 
 // Test that we hear the cursor change in other clients.
 TEST_F(WindowTreeClientTest, SetCursor) {
   // Get a second client to listen in.
   ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(true));
   Id window_1_1 = BuildWindowId(client_id_1(), 1);
   changes2()->clear();
 
   ASSERT_TRUE(
-      wt_client1()->SetPredefinedCursor(window_1_1, mojom::Cursor::IBEAM));
+      wt_client1()->SetPredefinedCursor(window_1_1, mojom::CursorType::IBEAM));
   wt_client2_->WaitForChangeCount(1u);
 
   EXPECT_EQ("CursorChanged id=" + IdToString(window_1_1) + " cursor_id=4",
             SingleChangeToDescription(*changes2()));
 }
 
 // Assertions for SetWindowVisibility sending notifications.
 TEST_F(WindowTreeClientTest, SetWindowVisibilityNotifications) {
   // Create 1,1 and 1,2. 1,2 is made a child of 1,1 and 1,1 a child of the root.
   Id window_1_1 = wt_client1()->NewWindow(1);
@@ skipping 617 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui