Enable CursorManager::LockCursor to lock cursor visibility.

ash/extended_desktop_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/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 150 matching lines @@
   // Close system modal and so clicking a widget should work now.
   modal_widget->Close();
   generator_1st.MoveMouseToCenterOf(widget_on_1st->GetNativeView());
   generator_1st.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(widget_on_1st->GetNativeView()));
   EXPECT_EQ(root_windows[0], Shell::GetActiveRootWindow());
 }
 
 TEST_F(ExtendedDesktopTest, TestCursor) {
   UpdateDisplay("1000x600,600x400");
-  Shell::GetInstance()->cursor_manager()->ShowCursor(false);
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
-  EXPECT_FALSE(root_windows[0]->cursor_shown());
-  EXPECT_FALSE(root_windows[1]->cursor_shown());
-  Shell::GetInstance()->cursor_manager()->ShowCursor(true);
-  EXPECT_TRUE(root_windows[0]->cursor_shown());
-  EXPECT_TRUE(root_windows[1]->cursor_shown());
-
   EXPECT_EQ(ui::kCursorPointer, root_windows[0]->last_cursor().native_type());
   EXPECT_EQ(ui::kCursorPointer, root_windows[1]->last_cursor().native_type());
   Shell::GetInstance()->cursor_manager()->SetCursor(ui::kCursorCopy);
   EXPECT_EQ(ui::kCursorCopy, root_windows[0]->last_cursor().native_type());
   EXPECT_EQ(ui::kCursorCopy, root_windows[1]->last_cursor().native_type());
 }
 
 TEST_F(ExtendedDesktopTest, TestCursorLocation) {
   UpdateDisplay("0+0-1000x600,1001+0-600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ skipping 405 matching lines @@
   EXPECT_EQ(root_windows[1], w1->GetNativeView()->GetRootWindow());
 
   // The widget should now move to the 1st root window without the property.
   w1->GetNativeView()->ClearProperty(internal::kStayInSameRootWindowKey);
   w1->SetBounds(gfx::Rect(10, 10, 50, 50));
   EXPECT_EQ(root_windows[0], w1->GetNativeView()->GetRootWindow());
 }
 
 }  // namespace internal
 }  // namespace ash