events: Update scroll and touch handlers to not return EventResult.

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 44399dc812760f68498f34ebb0fc7f02c67ec619..8d5752f3d0c9487cf8a367020ec2216d46f00fe7 100644
--- a/ui/aura/gestures/gesture_recognizer_unittest.cc
+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
@@ -310,12 +310,11 @@ class QueueTouchEventDelegate : public GestureEventConsumeDelegate {
   }
   virtual ~QueueTouchEventDelegate() {}
 
-  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
     if (queue_events_) {
       queue_.push(new ui::TouchEvent(*event, window_, window_));
-      return ui::ER_CONSUMED;
+      event->StopPropagation();
     }
-    return ui::ER_UNHANDLED;
   }
 
   void ReceivedAck() {
@@ -2605,10 +2604,11 @@ class ConsumesTouchMovesDelegate : public GestureEventConsumeDelegate {
   void set_consume_touch_move(bool consume) { consume_touch_move_ = consume; }
 
  private:
-  virtual ui::EventResult OnTouchEvent(ui::TouchEvent* touch) OVERRIDE {
+  virtual void OnTouchEvent(ui::TouchEvent* touch) OVERRIDE {
     if (consume_touch_move_ && touch->type() == ui::ET_TOUCH_MOVED)
-      return ui::ER_HANDLED;
-    return GestureEventConsumeDelegate::OnTouchEvent(touch);
+      touch->SetHandled();
+    else
+      GestureEventConsumeDelegate::OnTouchEvent(touch);
   }
 
   bool consume_touch_move_;