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

content/browser/renderer_host/render_widget_host_view_aura_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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 162 matching lines @@
   widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, false));
   EXPECT_FALSE(widget_host_->ShouldForwardTouchEvent());
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(30, 30), 0,
       base::Time::NowFromSystemTime() - base::Time());
   ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(20, 20), 0,
       base::Time::NowFromSystemTime() - base::Time());
   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);
 
   // Now install some touch-event handlers and do the same steps. The touch
   // events should now be consumed. However, the touch-event state should be
   // updated as before.
   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,
             view_->touch_event_.touches[0].state);
 
   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);
 }
 
 // Checks that touch-events are queued properly when there is a touch-event
 // handler on the page.
 TEST_F(RenderWidgetHostViewAuraTest, TouchEventSyncAsync) {
   view_->InitAsChild(NULL);
   view_->Show();
 
   widget_host_->OnMessageReceived(ViewHostMsg_HasTouchEventHandlers(0, true));
   EXPECT_TRUE(widget_host_->ShouldForwardTouchEvent());
 
   ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(30, 30), 0,
       base::Time::NowFromSystemTime() - base::Time());
   ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(20, 20), 0,
       base::Time::NowFromSystemTime() - base::Time());
   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,
             view_->touch_event_.touches[0].state);
 
   // 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);
 }
 
 }  // namespace content