Initial support of large mouse cursor on Exosphere

ui/wm/core/cursor_manager_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 "ui/wm/core/cursor_manager.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/wm/core/native_cursor_manager.h"
+#include "ui/wm/test/testing_cursor_client_observer.h"
 
 namespace {
 
 class TestingCursorManager : public wm::NativeCursorManager {
  public:
   // Overridden from wm::NativeCursorManager:
   void SetDisplay(const display::Display& display,
                   wm::NativeCursorManagerDelegate* delegate) override {}
 
   void SetCursor(gfx::NativeCursor cursor,
@@ skipping 23 matching lines @@
 class CursorManagerTest : public aura::test::AuraTestBase {
  protected:
   CursorManagerTest()
       : delegate_(new TestingCursorManager),
         cursor_manager_(base::WrapUnique(delegate_)) {}
 
   TestingCursorManager* delegate_;
   wm::CursorManager cursor_manager_;
 };
 
-class TestingCursorClientObserver : public aura::client::CursorClientObserver {
- public:
-  TestingCursorClientObserver()
-      : cursor_visibility_(false),
-        did_visibility_change_(false) {}
-  void reset() { cursor_visibility_ = did_visibility_change_ = false; }
-  bool is_cursor_visible() const { return cursor_visibility_; }
-  bool did_visibility_change() const { return did_visibility_change_; }
-
-  // Overridden from aura::client::CursorClientObserver:
-  void OnCursorVisibilityChanged(bool is_visible) override {
-    cursor_visibility_ = is_visible;
-    did_visibility_change_ = true;
-  }
-
- private:
-  bool cursor_visibility_;
-  bool did_visibility_change_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestingCursorClientObserver);
-};
-
 TEST_F(CursorManagerTest, ShowHideCursor) {
   cursor_manager_.SetCursor(ui::kCursorCopy);
   EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
 
   cursor_manager_.ShowCursor();
   EXPECT_TRUE(cursor_manager_.IsCursorVisible());
   cursor_manager_.HideCursor();
   EXPECT_FALSE(cursor_manager_.IsCursorVisible());
   // The current cursor does not change even when the cursor is not shown.
   EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
@@ skipping 81 matching lines @@
   cursor_manager_.UnlockCursor();
   EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
 
   cursor_manager_.DisableMouseEvents();
   cursor_manager_.LockCursor();
   cursor_manager_.UnlockCursor();
   EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
 }
 
 TEST_F(CursorManagerTest, SetCursorSet) {
+  wm::TestingCursorClientObserver observer;
+  cursor_manager_.AddObserver(&observer);
+
   EXPECT_EQ(ui::CURSOR_SET_NORMAL, cursor_manager_.GetCursorSet());
+  EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer.cursor_set());
 
   cursor_manager_.SetCursorSet(ui::CURSOR_SET_NORMAL);
   EXPECT_EQ(ui::CURSOR_SET_NORMAL, cursor_manager_.GetCursorSet());
+  EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer.cursor_set());
 
   cursor_manager_.SetCursorSet(ui::CURSOR_SET_LARGE);
   EXPECT_EQ(ui::CURSOR_SET_LARGE, cursor_manager_.GetCursorSet());
+  EXPECT_EQ(ui::CURSOR_SET_LARGE, observer.cursor_set());
 
   cursor_manager_.SetCursorSet(ui::CURSOR_SET_NORMAL);
   EXPECT_EQ(ui::CURSOR_SET_NORMAL, cursor_manager_.GetCursorSet());
+  EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer.cursor_set());
 }
 
 TEST_F(CursorManagerTest, IsMouseEventsEnabled) {
   cursor_manager_.EnableMouseEvents();
   EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
   cursor_manager_.DisableMouseEvents();
   EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
 }
 
 // Verifies that the mouse events enable state changes correctly when
@@ skipping 70 matching lines @@
   cursor_manager_.EnableMouseEvents();
   cursor_manager_.EnableMouseEvents();
   cursor_manager_.LockCursor();
   cursor_manager_.UnlockCursor();
   EXPECT_TRUE(cursor_manager_.IsCursorVisible());
 }
 
 TEST_F(CursorManagerTest, TestCursorClientObserver) {
   // Add two observers. Both should have OnCursorVisibilityChanged()
   // invoked when the visibility of the cursor changes.
-  TestingCursorClientObserver observer_a;
-  TestingCursorClientObserver observer_b;
+  wm::TestingCursorClientObserver observer_a;
+  wm::TestingCursorClientObserver observer_b;
   cursor_manager_.AddObserver(&observer_a);
   cursor_manager_.AddObserver(&observer_b);
 
   // Initial state before any events have been sent.
   observer_a.reset();
   observer_b.reset();
   EXPECT_FALSE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_FALSE(observer_a.is_cursor_visible());
   EXPECT_FALSE(observer_b.is_cursor_visible());
+  EXPECT_FALSE(observer_a.did_cursor_set_change());
+  EXPECT_FALSE(observer_b.did_cursor_set_change());
 
   // Hide the cursor using HideCursor().
   cursor_manager_.HideCursor();
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_TRUE(observer_b.did_visibility_change());
   EXPECT_FALSE(observer_a.is_cursor_visible());
   EXPECT_FALSE(observer_b.is_cursor_visible());
 
+  // Set the cursor set.
+  cursor_manager_.SetCursorSet(ui::CURSOR_SET_LARGE);
+  EXPECT_TRUE(observer_a.did_cursor_set_change());
+  EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_a.cursor_set());
+  EXPECT_TRUE(observer_b.did_cursor_set_change());
+  EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_b.cursor_set());
+
   // Show the cursor using ShowCursor().
   observer_a.reset();
   observer_b.reset();
   cursor_manager_.ShowCursor();
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_TRUE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
   EXPECT_TRUE(observer_b.is_cursor_visible());
 
   // Remove observer_b. Its OnCursorVisibilityChanged() should
   // not be invoked past this point.
   cursor_manager_.RemoveObserver(&observer_b);
 
   // Hide the cursor using HideCursor().
   observer_a.reset();
   observer_b.reset();
   cursor_manager_.HideCursor();
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_FALSE(observer_a.is_cursor_visible());
 
+  // Set back the cursor set to normal.
+  cursor_manager_.SetCursorSet(ui::CURSOR_SET_NORMAL);
+  EXPECT_TRUE(observer_a.did_cursor_set_change());
+  EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer_a.cursor_set());
+  EXPECT_FALSE(observer_b.did_cursor_set_change());
+
   // Show the cursor using ShowCursor().
   observer_a.reset();
   observer_b.reset();
   cursor_manager_.ShowCursor();
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 
 // This test validates that the cursor visiblity state is restored when a
@@ skipping 23 matching lines @@
   // This block validates that the cursor is visible initially. It then
   // performs normal cursor visibility operations.
   {
     wm::CursorManager cursor_manager3(
         base::WrapUnique(new TestingCursorManager));
     EXPECT_TRUE(cursor_manager3.IsCursorVisible());
     cursor_manager3.HideCursor();
     EXPECT_FALSE(cursor_manager3.IsCursorVisible());
   }
 }