Remove infinite spin, make tooltip delay consistent

ui/views/corewm/tooltip_controller_test_helper.cc

Index: ui/views/corewm/tooltip_controller_test_helper.cc
diff --git a/ui/views/corewm/tooltip_controller_test_helper.cc b/ui/views/corewm/tooltip_controller_test_helper.cc
index f96b08dc50a425ee416a2ea60704ed1b170096d1..45d940fe8f5a3458a816f08d94f93efa7d10a4ac 100644
--- a/ui/views/corewm/tooltip_controller_test_helper.cc
+++ b/ui/views/corewm/tooltip_controller_test_helper.cc
@@ -14,6 +14,7 @@ namespace test {
 TooltipControllerTestHelper::TooltipControllerTestHelper(
     TooltipController* controller)
     : controller_(controller) {
+  controller_->DisableTooltipShowDelay();
 }
 
 TooltipControllerTestHelper::~TooltipControllerTestHelper() {
@@ -27,12 +28,8 @@ aura::Window* TooltipControllerTestHelper::GetTooltipWindow() {
   return controller_->tooltip_window_;
 }
 
-void TooltipControllerTestHelper::FireTooltipTimer() {
-  controller_->TooltipTimerFired();
-}
-
-bool TooltipControllerTestHelper::IsTooltipTimerRunning() {
-  return controller_->tooltip_timer_.IsRunning();
+void TooltipControllerTestHelper::UpdateIfRequired() {
+  controller_->UpdateIfRequired();
 }
 
 void TooltipControllerTestHelper::FireTooltipShownTimer() {