Revert of Remove unnecessary spin in ToolTipController

ui/views/corewm/tooltip_controller.h

Index: ui/views/corewm/tooltip_controller.h
diff --git a/ui/views/corewm/tooltip_controller.h b/ui/views/corewm/tooltip_controller.h
index 7400132b35a7fcf9837a3ac96df109b0624fd09c..5a274e319cd5edea134ef540a759884c323edbe0 100644
--- a/ui/views/corewm/tooltip_controller.h
+++ b/ui/views/corewm/tooltip_controller.h
@@ -11,7 +11,6 @@
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
-#include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/geometry/point.h"
@@ -32,11 +31,9 @@
 }  // namespace test
 
 // TooltipController provides tooltip functionality for aura.
-class VIEWS_EXPORT TooltipController
-    : public aura::client::TooltipClient,
-      public ui::EventHandler,
-      public aura::client::CursorClientObserver,
-      public aura::WindowObserver {
+class VIEWS_EXPORT TooltipController : public aura::client::TooltipClient,
+                                       public ui::EventHandler,
+                                       public aura::WindowObserver {
  public:
   explicit TooltipController(std::unique_ptr<Tooltip> tooltip);
   ~TooltipController() override;
@@ -53,20 +50,15 @@
   void OnTouchEvent(ui::TouchEvent* event) override;
   void OnCancelMode(ui::CancelModeEvent* event) override;
 
-  // Overridden from aura::client::CursorClientObserver.
-  void OnCursorVisibilityChanged(bool is_visible) override;
-
   // Overridden from aura::WindowObserver.
   void OnWindowDestroyed(aura::Window* window) override;
-  void OnWindowPropertyChanged(aura::Window* window,
-                               const void* key,
-                               intptr_t old) override;
 
   const gfx::Point& mouse_location() const { return curr_mouse_loc_; }
 
  private:
   friend class test::TooltipControllerTestHelper;
 
+  void TooltipTimerFired();
   void TooltipShownTimerFired();
 
   // Updates the tooltip if required (if there is any change in the tooltip
@@ -98,6 +90,8 @@
 
   std::unique_ptr<Tooltip> tooltip_;
 
+  base::RepeatingTimer tooltip_timer_;
+
   // Timer to timeout the life of an on-screen tooltip. We hide the tooltip when
   // this timer fires.
   base::OneShotTimer tooltip_shown_timer_;