mus ws: Consistently use mojom::Cursor instead of int32_t.

services/ui/ws/cursor_unittest.cc

 // Copyright 2016 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 <stdint.h>
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 26 matching lines @@
 
 class CursorTest : public testing::Test {
  public:
   CursorTest() {}
   ~CursorTest() override {}
 
   WindowServer* window_server() { return ws_test_helper_.window_server(); }
   TestWindowServerDelegate* window_server_delegate() {
     return ws_test_helper_.window_server_delegate();
   }
-  int32_t cursor_id() const { return ws_test_helper_.cursor_id(); }
+  mojom::Cursor cursor() const { return ws_test_helper_.cursor(); }
 
  protected:
   // testing::Test:
   void SetUp() override {
     window_server_delegate()->set_num_displays_to_create(1);
 
     // As a side effect, this allocates Displays.
     WindowManagerWindowTreeFactorySetTestApi(
         window_server()->window_manager_window_tree_factory_set())
         .Add(kTestId1);
@@ skipping 45 matching lines @@
   }
 
  private:
   WindowServerTestHelper ws_test_helper_;
   DISALLOW_COPY_AND_ASSIGN(CursorTest);
 };
 
 TEST_F(CursorTest, ChangeByMouseMove) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE,
-            mojom::Cursor(win->non_client_cursor()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   // Non client area
   MoveCursorTo(gfx::Point(15, 15));
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   // Client area
   MoveCursorTo(gfx::Point(25, 25));
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
 }
 
 TEST_F(CursorTest, ChangeByClientAreaChange) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
   EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE,
-            mojom::Cursor(win->non_client_cursor()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   // Non client area before we move.
   MoveCursorTo(gfx::Point(15, 15));
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   // Changing the client area should cause a change.
   win->SetClientArea(gfx::Insets(1, 1), std::vector<gfx::Rect>());
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
 }
 
 TEST_F(CursorTest, NonClientCursorChange) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE,
-            mojom::Cursor(win->non_client_cursor()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   MoveCursorTo(gfx::Point(15, 15));
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetNonClientCursor(mojom::Cursor::WEST_RESIZE);
-  EXPECT_EQ(mojom::Cursor::WEST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::WEST_RESIZE, cursor());
 }
 
 TEST_F(CursorTest, IgnoreClientCursorChangeInNonClientArea) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE,
-            mojom::Cursor(win->non_client_cursor()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   MoveCursorTo(gfx::Point(15, 15));
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetPredefinedCursor(mojom::Cursor::HELP);
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 }
 
 TEST_F(CursorTest, NonClientToClientByBoundsChange) {
   ServerWindow* win = BuildServerWindow();
   win->SetPredefinedCursor(mojom::Cursor::IBEAM);
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(win->cursor()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, win->cursor());
   win->SetNonClientCursor(mojom::Cursor::EAST_RESIZE);
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE,
-            mojom::Cursor(win->non_client_cursor()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, win->non_client_cursor());
 
   // Non client area before we move.
   MoveCursorTo(gfx::Point(15, 15));
-  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::EAST_RESIZE, cursor());
 
   win->SetBounds(gfx::Rect(0, 0, 30, 30));
-  EXPECT_EQ(mojom::Cursor::IBEAM, mojom::Cursor(cursor_id()));
+  EXPECT_EQ(mojom::Cursor::IBEAM, cursor());
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui