Re-enable Eager Gesture Recognition on Aura

ui/events/gestures/gesture_recognizer_impl.cc

Index: ui/events/gestures/gesture_recognizer_impl.cc
diff --git a/ui/events/gestures/gesture_recognizer_impl.cc b/ui/events/gestures/gesture_recognizer_impl.cc
index 9f6eb3ee073b3a894f04a2c52710954591ff439a..c714ea0fdf3b17217819b82d42ffc007449343e8 100644
--- a/ui/events/gestures/gesture_recognizer_impl.cc
+++ b/ui/events/gestures/gesture_recognizer_impl.cc
@@ -234,9 +234,8 @@ void GestureRecognizerImpl::DispatchGestureEvent(GestureEvent* event) {
   }
 }
 
-bool GestureRecognizerImpl::ProcessTouchEventPreDispatch(
-    const TouchEvent& event,
-    GestureConsumer* consumer) {
+bool GestureRecognizerImpl::ProcessTouchEvent(const TouchEvent& event,
+                                              GestureConsumer* consumer) {
   SetupTargets(event, consumer);
 
   if (event.result() & ER_CONSUMED)
@@ -247,23 +246,11 @@ bool GestureRecognizerImpl::ProcessTouchEventPreDispatch(
   return gesture_provider->OnTouchEvent(event);
 }
 
-GestureRecognizer::Gestures*
-GestureRecognizerImpl::ProcessTouchEventPostDispatch(
-    const TouchEvent& event,
-    ui::EventResult result,
-    GestureConsumer* consumer) {
-  GestureProviderAura* gesture_provider =
-      GetGestureProviderForConsumer(consumer);
-  gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
-  return gesture_provider->GetAndResetPendingGestures();
-}
-
-GestureRecognizer::Gestures* GestureRecognizerImpl::ProcessTouchEventOnAsyncAck(
+GestureRecognizer::Gestures* GestureRecognizerImpl::ProcessTouchEventAck(
     const TouchEvent& event,
     ui::EventResult result,
     GestureConsumer* consumer) {
-  if (result & ui::ER_CONSUMED)
-    return NULL;
+  DCHECK(!(result & ui::ER_CONSUMED));
   GestureProviderAura* gesture_provider =
       GetGestureProviderForConsumer(consumer);
   gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);