Merge 173933

ash/test/ash_test_base.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/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/display/display_controller.h"
@@ skipping 47 matching lines @@
   ui::LayerAnimator::set_disable_animations_for_test(true);
   ui::TextInputTestSupport::Initialize();
   // Creates Shell and hook with Desktop.
   test_shell_delegate_ = new TestShellDelegate;
   ash::Shell::CreateInstance(test_shell_delegate_);
   Shell::GetPrimaryRootWindow()->Show();
   Shell::GetPrimaryRootWindow()->ShowRootWindow();
   // Move the mouse cursor to far away so that native events doesn't
   // interfere test expectations.
   Shell::GetPrimaryRootWindow()->MoveCursorTo(gfx::Point(-1000, -1000));
-  Shell::GetInstance()->cursor_manager()->ShowCursor(true);
+  Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
 }
 
 void AshTestBase::TearDown() {
   // Flush the message loop to finish pending release tasks.
   RunAllPendingInMessageLoop();
 
   // Tear down the shell.
   Shell::DeleteInstance();
   aura::Env::DeleteInstance();
   ui::TextInputTestSupport::Shutdown();
@@ skipping 81 matching lines @@
 void AshTestBase::SetUserLoggedIn(bool user_logged_in) {
   test_shell_delegate_->SetUserLoggedIn(user_logged_in);
 }
 
 void AshTestBase::SetCanLockScreen(bool can_lock_screen) {
   test_shell_delegate_->SetCanLockScreen(can_lock_screen);
 }
 
 }  // namespace test
 }  // namespace ash