Merge 173933

ash/tooltips/tooltip_controller_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/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/tooltips/tooltip_controller.h"
 #include "ash/wm/cursor_manager.h"
 #include "base/utf_string_conversions.h"
@@ skipping 249 matching lines @@
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.MoveMouseRelativeTo(widget->GetNativeView(),
                                 view->bounds().CenterPoint());
   string16 expected_tooltip = ASCIIToUTF16("Tooltip Text");
 
   // Fire tooltip timer so tooltip becomes visible.
   FireTooltipTimer();
   EXPECT_TRUE(IsTooltipVisible());
 
   // Hide the cursor and check again.
-  ash::Shell::GetInstance()->cursor_manager()->ShowCursor(false);
+  ash::Shell::GetInstance()->cursor_manager()->DisableMouseEvents();
   FireTooltipTimer();
   EXPECT_FALSE(IsTooltipVisible());
 
   // Show the cursor and re-check.
-  ash::Shell::GetInstance()->cursor_manager()->ShowCursor(true);
+  ash::Shell::GetInstance()->cursor_manager()->EnableMouseEvents();
   FireTooltipTimer();
   EXPECT_TRUE(IsTooltipVisible());
 }
 
 TEST_F(TooltipControllerTest, TrimTooltipToFitTests) {
   string16 tooltip;
   int max_width, line_count, expect_lines;
   int max_pixel_width = 400;  // copied from constants in tooltip_controller.cc
   int max_lines = 10;  // copied from constants in tooltip_controller.cc
   gfx::Font font = GetDefaultFont();
@@ skipping 232 matching lines @@
   // be able to show tooltips on the primary display.
   aura::test::EventGenerator generator1(root_windows[0]);
   generator1.MoveMouseRelativeTo(widget1->GetNativeView(),
                                  view1->bounds().CenterPoint());
   FireTooltipTimer();
   EXPECT_TRUE(IsTooltipVisible());
 }
 
 }  // namespace test
 }  // namespace ash