Eager Gesture Recognizer (WIP)

ui/aura/gestures/gesture_recognizer_unittest.cc

Index: ui/aura/gestures/gesture_recognizer_unittest.cc
diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
index d6f28bb6fa2790f3e5ef67aa013b88423a68e4d9..2f5526a3b3c5cacd189189f67fbc1a574f06b190 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -459,7 +459,7 @@ class GestureEventSynthDelegate : public TestWindowDelegate {
 };
 
 class TestOneShotGestureSequenceTimer
-    : public base::OneShotTimer<ui::GestureSequence> {
+    : public base::OneShotTimer<ui::GestureEventQueueTimerInterface> {
  public:
   TestOneShotGestureSequenceTimer() {}
 
@@ -476,8 +476,9 @@ class TestOneShotGestureSequenceTimer
 
 class TimerTestGestureSequence : public ui::GestureSequence {
  public:
-  explicit TimerTestGestureSequence(ui::GestureSequenceDelegate* delegate)
-      : ui::GestureSequence(delegate) {
+  explicit TimerTestGestureSequence(
+      ui::GestureEventQueueTimerInterface* geq_timers)
+      : ui::GestureSequence(geq_timers) {
   }
 
   void ForceTimeout() {
@@ -489,7 +490,8 @@ class TimerTestGestureSequence : public ui::GestureSequence {
     return GetLongPressTimer()->IsRunning();
   }
 
-  virtual base::OneShotTimer<ui::GestureSequence>* CreateTimer() OVERRIDE {
+  virtual base::OneShotTimer<ui::GestureEventQueueTimerInterface>*
+  CreateTimer() OVERRIDE {
     return new TestOneShotGestureSequenceTimer();
   }
 
@@ -503,7 +505,7 @@ class TestGestureRecognizer : public ui::GestureRecognizerImpl {
   }
 
   ui::GestureSequence* GetGestureSequenceForTesting(Window* window) {
-    return GetGestureSequenceForConsumer(window);
+    return GetGestureSequenceForConsumer(window, NULL);
   }
 
  private:
@@ -516,8 +518,8 @@ class TimerTestGestureRecognizer : public TestGestureRecognizer {
   }
 
   virtual ui::GestureSequence* CreateSequence(
-      ui::GestureSequenceDelegate* delegate) OVERRIDE {
-    return new TimerTestGestureSequence(delegate);
+      ui::GestureEventQueueTimerInterface* geq_timers) OVERRIDE {
+    return new TimerTestGestureSequence(geq_timers);
   }
 
  private: