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

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 624d257cee6e7e242eb882f4c085167dab3b9f69..bf5ea731e0d6b62f3d14a4d2d6afdb5294b16322 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1587,8 +1587,7 @@ ui::EventResult RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
   return ui::ER_HANDLED;
 }
 
-ui::EventResult RenderWidgetHostViewAura::OnScrollEvent(
-    ui::ScrollEvent* event) {
+void RenderWidgetHostViewAura::OnScrollEvent(ui::ScrollEvent* event) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnScrollEvent");
   if (event->type() == ui::ET_SCROLL) {
     WebKit::WebGestureEvent gesture_event =
@@ -1606,10 +1605,11 @@ ui::EventResult RenderWidgetHostViewAura::OnScrollEvent(
     if (event->type() == ui::ET_SCROLL_FLING_START)
       RecordAction(UserMetricsAction("TrackpadScrollFling"));
   }
-  return ui::ER_HANDLED;
+
+  event->SetHandled();
 }
 
-ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
+void RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnTouchEvent");
   // Update the touch event first.
   WebKit::WebTouchPoint* point = UpdateWebTouchEventFromUIEvent(*event,
@@ -1621,15 +1621,14 @@ ui::EventResult RenderWidgetHostViewAura::OnTouchEvent(ui::TouchEvent* event) {
   // handler in the page, or some touch-event is already in the queue, even if
   // no point has been updated, to make sure that this event does not get
   // processed by the gesture recognizer before the events in the queue.
-  ui::EventResult result = host_->ShouldForwardTouchEvent() ? ui::ER_CONSUMED :
-                                                              ui::ER_UNHANDLED;
+  if (host_->ShouldForwardTouchEvent())
+    event->StopPropagation();
+
   if (point) {
     if (host_->ShouldForwardTouchEvent())
       host_->ForwardTouchEvent(touch_event_);
     UpdateWebTouchEventAfterDispatch(&touch_event_, point);
   }
-
-  return result;
 }
 
 void RenderWidgetHostViewAura::OnGestureEvent(ui::GestureEvent* event) {