ozone: evdev: Make cancellation of repeats on key up more robust

ui/events/ozone/evdev/keyboard_evdev.h

Index: ui/events/ozone/evdev/keyboard_evdev.h
diff --git a/ui/events/ozone/evdev/keyboard_evdev.h b/ui/events/ozone/evdev/keyboard_evdev.h
index 0560faa6f77126caabe50202f0c6d3002e5e6372..f78bcea7502321ce4299fe33146ae1149f0c9f85 100644
--- a/ui/events/ozone/evdev/keyboard_evdev.h
+++ b/ui/events/ozone/evdev/keyboard_evdev.h
@@ -53,8 +53,9 @@ class EVENTS_OZONE_EVDEV_EXPORT KeyboardEvdev {
   void UpdateKeyRepeat(unsigned int key, bool down);
   void StartKeyRepeat(unsigned int key);
   void StopKeyRepeat();
-  void OnRepeatDelayTimeout();
-  void OnRepeatIntervalTimeout();
+  void ScheduleKeyRepeat(const base::TimeDelta& delay);
+  void OnRepeatTimeout(unsigned int sequence);
+  void DispatchKeyRepeat(unsigned int key);
   void DispatchKey(unsigned int key,
                    bool down,
                    bool repeat,
@@ -81,10 +82,11 @@ class EVENTS_OZONE_EVDEV_EXPORT KeyboardEvdev {
   // Key repeat state.
   bool repeat_enabled_;
   unsigned int repeat_key_;
+  unsigned int repeat_sequence_;
   base::TimeDelta repeat_delay_;
   base::TimeDelta repeat_interval_;
-  base::OneShotTimer<KeyboardEvdev> repeat_delay_timer_;
-  base::RepeatingTimer<KeyboardEvdev> repeat_interval_timer_;
+
+  base::WeakPtrFactory<KeyboardEvdev> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyboardEvdev);
 };