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

ui/base/events/event_dispatcher_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/events/event_dispatcher.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 
@@ skipping 72 matching lines @@
   virtual EventResult OnKeyEvent(KeyEvent* event) OVERRIDE {
     ReceivedEvent(event);
     return event_result_;
   }
 
   virtual EventResult OnMouseEvent(MouseEvent* event) OVERRIDE {
     ReceivedEvent(event);
     return event_result_;
   }
 
-  virtual EventResult OnScrollEvent(ScrollEvent* event) OVERRIDE {
+  virtual void OnScrollEvent(ScrollEvent* event) OVERRIDE {
     ReceivedEvent(event);
-    return event_result_;
+    SetStatusOnEvent(event);
   }
 
-  virtual EventResult OnTouchEvent(TouchEvent* event) OVERRIDE {
+  virtual void OnTouchEvent(TouchEvent* event) OVERRIDE {
     ReceivedEvent(event);
-    return event_result_;
+    SetStatusOnEvent(event);
   }
 
   virtual void OnGestureEvent(GestureEvent* event) OVERRIDE {
     ReceivedEvent(event);
+    SetStatusOnEvent(event);
+  }
+
+  void SetStatusOnEvent(Event* event) {
     if (event_result_ & ui::ER_CONSUMED)
       event->StopPropagation();
     if (event_result_ & ui::ER_HANDLED)
       event->SetHandled();
   }
 
   int id_;
   EventResult event_result_;
   bool expect_pre_target_;
   bool expect_post_target_;
@@ skipping 347 matching lines @@
   h3->set_expect_pre_target(false);
 
   MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0);
   dispatcher->ProcessEvent(&target, &mouse);
   EXPECT_TRUE(mouse.stopped_propagation());
   EXPECT_EQ(2U, target.handler_list().size());
   EXPECT_EQ(1, target.handler_list()[0]);
   EXPECT_EQ(2, target.handler_list()[1]);
 }
 }  // namespace ui