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

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index e4b6181b7471f9eb93c9914e7b06c0a79d9f230e..7c866103709c51d48f251259c564ae68ec8c9764 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -180,19 +180,22 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
   ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(20, 20), 0,
       base::Time::NowFromSystemTime() - base::Time());
 
-  EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&press));
+  view_->OnTouchEvent(&press);
+  EXPECT_FALSE(press.handled());
   EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StatePressed,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&move));
+  view_->OnTouchEvent(&move);
+  EXPECT_FALSE(move.handled());
   EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&release));
+  view_->OnTouchEvent(&release);
+  EXPECT_FALSE(release.handled());
   EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type);
   EXPECT_EQ(0U, view_->touch_event_.touchesLength);
 
@@ -202,24 +205,28 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
   widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
   EXPECT_TRUE(widget_host_->ShouldForwardTouchEvent());
 
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&press));
+  view_->OnTouchEvent(&press);
+  EXPECT_TRUE(press.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StatePressed,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&move));
+  view_->OnTouchEvent(&move);
+  EXPECT_TRUE(move.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&release));
+  view_->OnTouchEvent(&release);
+  EXPECT_TRUE(release.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type);
   EXPECT_EQ(0U, view_->touch_event_.touchesLength);
 
   // Now start a touch event, and remove the event-handlers before the release.
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&press));
+  view_->OnTouchEvent(&press);
+  EXPECT_TRUE(press.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StatePressed,
@@ -228,13 +235,19 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
   widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
   EXPECT_FALSE(widget_host_->ShouldForwardTouchEvent());
 
-  EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&move));
+  ui::TouchEvent move2(ui::ET_TOUCH_MOVED, gfx::Point(20, 20), 0,
+      base::Time::NowFromSystemTime() - base::Time());
+  view_->OnTouchEvent(&move2);
+  EXPECT_FALSE(move2.handled());
   EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_UNHANDLED, view_->OnTouchEvent(&release));
+  ui::TouchEvent release2(ui::ET_TOUCH_RELEASED, gfx::Point(20, 20), 0,
+      base::Time::NowFromSystemTime() - base::Time());
+  view_->OnTouchEvent(&release2);
+  EXPECT_FALSE(release2.handled());
   EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type);
   EXPECT_EQ(0U, view_->touch_event_.touchesLength);
 }
@@ -255,13 +268,15 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
   ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(20, 20), 0,
       base::Time::NowFromSystemTime() - base::Time());
 
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&press));
+  view_->OnTouchEvent(&press);
+  EXPECT_TRUE(press.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchStart, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StatePressed,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&move));
+  view_->OnTouchEvent(&move);
+  EXPECT_TRUE(move.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
@@ -269,13 +284,15 @@ TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
 
   // Send the same move event. Since the point hasn't moved, it won't affect the
   // queue. However, the view should consume the event.
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&move));
+  view_->OnTouchEvent(&move);
+  EXPECT_TRUE(move.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchMove, view_->touch_event_.type);
   EXPECT_EQ(1U, view_->touch_event_.touchesLength);
   EXPECT_EQ(WebKit::WebTouchPoint::StateMoved,
             view_->touch_event_.touches[0].state);
 
-  EXPECT_EQ(ui::ER_CONSUMED, view_->OnTouchEvent(&release));
+  view_->OnTouchEvent(&release);
+  EXPECT_TRUE(release.stopped_propagation());
   EXPECT_EQ(WebKit::WebInputEvent::TouchEnd, view_->touch_event_.type);
   EXPECT_EQ(0U, view_->touch_event_.touchesLength);
 }