Rework ash::CursorManager into a corewm object, to share code with desktop.

ash/wm/cursor_manager_unittest.cc

 // Copyright (c) 2012 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 "ash/wm/cursor_manager.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/wm/image_cursors.h"
@@ skipping 67 matching lines @@
   CursorManagerTestApi test_api(cursor_manager);
 
   cursor_manager->SetCursor(ui::kCursorCopy);
   EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
   EXPECT_TRUE(test_api.GetCurrentCursor().platform());
   cursor_manager->SetCursor(ui::kCursorPointer);
   EXPECT_EQ(ui::kCursorPointer, test_api.GetCurrentCursor().native_type());
   EXPECT_TRUE(test_api.GetCurrentCursor().platform());
 }
 
-TEST_F(CursorManagerTest, ShowHideCursor) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
-  CursorManagerTestApi test_api(cursor_manager);
-
-  cursor_manager->SetCursor(ui::kCursorCopy);
-  EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().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, test_api.GetCurrentCursor().native_type());
-
-  // Check if cursor visibility is locked.
-  cursor_manager->LockCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  cursor_manager->ShowCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-
-  cursor_manager->LockCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  cursor_manager->HideCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  cursor_manager->UnlockCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-
-  // Checks setting visiblity while cursor is locked does not affect the
-  // subsequent uses of UnlockCursor.
-  cursor_manager->LockCursor();
-  cursor_manager->HideCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-
-  cursor_manager->ShowCursor();
-  cursor_manager->LockCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-
-  cursor_manager->LockCursor();
-  cursor_manager->ShowCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-
-  cursor_manager->HideCursor();
-  cursor_manager->LockCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-}
-
 TEST_F(CursorManagerTest, SetDeviceScaleFactor) {
   CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   CursorManagerTestApi test_api(cursor_manager);
 
   cursor_manager->SetDeviceScaleFactor(2.0f);
   EXPECT_EQ(2.0f, test_api.GetDeviceScaleFactor());
   cursor_manager->SetDeviceScaleFactor(1.0f);
   EXPECT_EQ(1.0f, test_api.GetDeviceScaleFactor());
 }
 
-// Verifies that LockCursor/UnlockCursor work correctly with
-// EnableMouseEvents and DisableMouseEvents
-TEST_F(CursorManagerTest, EnableDisableMouseEvents) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
-  CursorManagerTestApi test_api(cursor_manager);
-
-  cursor_manager->SetCursor(ui::kCursorCopy);
-  EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
-
-  cursor_manager->EnableMouseEvents();
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->DisableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  // The current cursor does not change even when the cursor is not shown.
-  EXPECT_EQ(ui::kCursorCopy, test_api.GetCurrentCursor().native_type());
-
-  // Check if cursor enable state is locked.
-  cursor_manager->LockCursor();
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->EnableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-
-  cursor_manager->LockCursor();
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->DisableMouseEvents();
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->UnlockCursor();
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-
-  // Checks enabling cursor while cursor is locked does not affect the
-  // subsequent uses of UnlockCursor.
-  cursor_manager->LockCursor();
-  cursor_manager->DisableMouseEvents();
-  cursor_manager->UnlockCursor();
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-
-  cursor_manager->EnableMouseEvents();
-  cursor_manager->LockCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-
-  cursor_manager->LockCursor();
-  cursor_manager->EnableMouseEvents();
-  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, IsMouseEventsEnabled) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
-  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
-// ShowCursor/HideCursor and EnableMouseEvents/DisableMouseEvents are used
-// together.
-TEST_F(CursorManagerTest, ShowAndEnable) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
-
-  // Changing the visibility of the cursor does not affect the enable state.
-  cursor_manager->EnableMouseEvents();
-  cursor_manager->ShowCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->HideCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->ShowCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-
-  // When mouse events are disabled, it also gets invisible.
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  cursor_manager->DisableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-
-  // When mouse events are enabled, it restores the visibility state.
-  cursor_manager->EnableMouseEvents();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-
-  cursor_manager->ShowCursor();
-  cursor_manager->DisableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->EnableMouseEvents();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-
-  cursor_manager->HideCursor();
-  cursor_manager->DisableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->EnableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_TRUE(cursor_manager->IsMouseEventsEnabled());
-
-  // When mouse events are disabled, ShowCursor is ignored.
-  cursor_manager->DisableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->ShowCursor();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-  cursor_manager->DisableMouseEvents();
-  EXPECT_FALSE(cursor_manager->IsCursorVisible());
-  EXPECT_FALSE(cursor_manager->IsMouseEventsEnabled());
-}
-
-// Verifies that calling DisableMouseEvents multiple times in a row makes no
-// difference compared with calling it once.
-// This is a regression test for http://crbug.com/169404.
-TEST_F(CursorManagerTest, MultipleDisableMouseEvents) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
-  cursor_manager->DisableMouseEvents();
-  cursor_manager->DisableMouseEvents();
-  cursor_manager->EnableMouseEvents();
-  cursor_manager->LockCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-}
-
-// Verifies that calling EnableMouseEvents multiple times in a row makes no
-// difference compared with calling it once.
-TEST_F(CursorManagerTest, MultipleEnableMouseEvents) {
-  CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
-  cursor_manager->DisableMouseEvents();
-  cursor_manager->EnableMouseEvents();
-  cursor_manager->EnableMouseEvents();
-  cursor_manager->LockCursor();
-  cursor_manager->UnlockCursor();
-  EXPECT_TRUE(cursor_manager->IsCursorVisible());
-}
-
 #if defined(OS_WIN)
 // Temporarily disabled for windows. See crbug.com/112222.
 #define MAYBE_DisabledMouseEventsLocation DISABLED_DisabledMouseEventsLocation
 #else
 #define MAYBE_DisabledMouseEventsLocation DisabledMouseEventsLocation
 #endif  // defined(OS_WIN)
 
 // Verifies that RootWindow generates a mouse event located outside of a window
 // when mouse events are disabled.
 TEST_F(CursorManagerTest, MAYBE_DisabledMouseEventsLocation) {
@@ skipping 47 matching lines @@
   gfx::Point mouse_location;
   EXPECT_TRUE(root_window->QueryMouseLocationForTest(&mouse_location));
   EXPECT_EQ("10,10", mouse_location.ToString());
   Shell::GetInstance()->cursor_manager()->DisableMouseEvents();
   EXPECT_FALSE(root_window->QueryMouseLocationForTest(&mouse_location));
   EXPECT_EQ("0,0", mouse_location.ToString());
 }
 
 }  // namespace test
 }  // namespace ash