events: Start changing EventHandler interface to not return a value.

ui/base/events/event_dispatcher_unittest.cc

Index: ui/base/events/event_dispatcher_unittest.cc
diff --git a/ui/base/events/event_dispatcher_unittest.cc b/ui/base/events/event_dispatcher_unittest.cc
index 89285e4ef052311d087ac7a279c01d733e8832ac..be16da7cc36f7373935b08615840a639e0cca07a 100644
--- a/ui/base/events/event_dispatcher_unittest.cc
+++ b/ui/base/events/event_dispatcher_unittest.cc
@@ -202,9 +202,9 @@ TEST(EventDispatcherTest, EventDispatchOrder) {
   MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
       gfx::Point(3, 4), 0);
   Event::DispatcherApi event_mod(&mouse);
-  int result = dispatcher.ProcessEvent(&child, &mouse);
-  EXPECT_FALSE(result & ER_CONSUMED);
-  EXPECT_FALSE(result & ER_HANDLED);
+  dispatcher.ProcessEvent(&child, &mouse);
+  EXPECT_FALSE(mouse.stopped_propagation());
+  EXPECT_FALSE(mouse.default_prevented());
 
   int expected[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
   EXPECT_EQ(
@@ -216,11 +216,10 @@ TEST(EventDispatcherTest, EventDispatchOrder) {
   event_mod.set_result(ER_UNHANDLED);
 
   h1.set_event_result(ER_HANDLED);
-  result = dispatcher.ProcessEvent(&child, &mouse);
-  EXPECT_EQ(result, mouse.result());
+  dispatcher.ProcessEvent(&child, &mouse);
   EXPECT_EQ(EP_POSTDISPATCH, mouse.phase());
-  EXPECT_FALSE(result & ER_CONSUMED);
-  EXPECT_TRUE(result & ER_HANDLED);
+  EXPECT_FALSE(mouse.stopped_propagation());
+  EXPECT_TRUE(mouse.default_prevented());
   EXPECT_EQ(
       std::vector<int>(expected, expected + sizeof(expected) / sizeof(int)),
       child.handler_list());
@@ -231,11 +230,10 @@ TEST(EventDispatcherTest, EventDispatchOrder) {
 
   int nexpected[] = { 1, 2, 3, 4, 5 };
   h5.set_event_result(ER_CONSUMED);
-  result = dispatcher.ProcessEvent(&child, &mouse);
-  EXPECT_EQ(result, mouse.result());
+  dispatcher.ProcessEvent(&child, &mouse);
   EXPECT_EQ(EP_POSTDISPATCH, mouse.phase());
-  EXPECT_TRUE(result & ER_CONSUMED);
-  EXPECT_TRUE(result & ER_HANDLED);
+  EXPECT_TRUE(mouse.stopped_propagation());
+  EXPECT_TRUE(mouse.default_prevented());
   EXPECT_EQ(
       std::vector<int>(nexpected, nexpected + sizeof(nexpected) / sizeof(int)),
       child.handler_list());
@@ -246,11 +244,10 @@ TEST(EventDispatcherTest, EventDispatchOrder) {
 
   int exp[] = { 1 };
   h1.set_event_result(ER_CONSUMED);
-  result = dispatcher.ProcessEvent(&child, &mouse);
+  dispatcher.ProcessEvent(&child, &mouse);
   EXPECT_EQ(EP_POSTDISPATCH, mouse.phase());
-  EXPECT_EQ(result, mouse.result());
-  EXPECT_TRUE(result & ER_CONSUMED);
-  EXPECT_FALSE(result & ER_HANDLED);
+  EXPECT_TRUE(mouse.stopped_propagation());
+  EXPECT_TRUE(mouse.default_prevented());
   EXPECT_EQ(
       std::vector<int>(exp, exp + sizeof(exp) / sizeof(int)),
       child.handler_list());
@@ -271,8 +268,8 @@ TEST(EventDispatcherTest, EventDispatchPhase) {
   MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
       gfx::Point(3, 4), 0);
   Event::DispatcherApi event_mod(&mouse);
-  int result = dispatcher.ProcessEvent(&target, &mouse);
-  EXPECT_EQ(ER_UNHANDLED, result);
+  dispatcher.ProcessEvent(&target, &mouse);
+  EXPECT_EQ(ER_UNHANDLED, mouse.result());
 
   int handlers[] = { 11, 11 };
   EXPECT_EQ(
@@ -303,8 +300,8 @@ TEST(EventDispatcherTest, EventDispatcherDestroyTarget) {
     MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
         gfx::Point(3, 4), 0);
     Event::DispatcherApi event_mod(&mouse);
-    int result = dispatcher->ProcessEvent(&target, &mouse);
-    EXPECT_EQ(ER_CONSUMED, result);
+    dispatcher->ProcessEvent(&target, &mouse);
+    EXPECT_EQ(ER_CONSUMED, mouse.result());
     EXPECT_EQ(2U, target.handler_list().size());
     EXPECT_EQ(1, target.handler_list()[0]);
     EXPECT_EQ(5, target.handler_list()[1]);
@@ -330,8 +327,8 @@ TEST(EventDispatcherTest, EventDispatcherDestroyTarget) {
     MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
         gfx::Point(3, 4), 0);
     Event::DispatcherApi event_mod(&mouse);
-    int result = dispatcher->ProcessEvent(&target, &mouse);
-    EXPECT_EQ(ER_CONSUMED, result);
+    dispatcher->ProcessEvent(&target, &mouse);
+    EXPECT_EQ(ER_CONSUMED, mouse.result());
     EXPECT_EQ(2U, target.handler_list().size());
     EXPECT_EQ(1, target.handler_list()[0]);
     EXPECT_EQ(5, target.handler_list()[1]);
@@ -357,9 +354,9 @@ TEST(EventDispatcherTest, EventDispatcherInvalidateTarget) {
   h3.set_expect_pre_target(false);
 
   MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0);
-  int result = dispatcher.ProcessEvent(&target, &mouse);
+  dispatcher.ProcessEvent(&target, &mouse);
   EXPECT_FALSE(target.valid());
-  EXPECT_EQ(ER_CONSUMED, result);
+  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]);