Sync ui/events to chromium @ https://codereview.chromium.org/1210203002

ui/events/event_dispatcher_unittest.cc

Index: ui/events/event_dispatcher_unittest.cc
diff --git a/ui/events/event_dispatcher_unittest.cc b/ui/events/event_dispatcher_unittest.cc
index d6caf00172964630a711960f378dad920376ae47..0bae34e81918f4597ff3a63a9590931479fba88a 100644
--- a/ui/events/event_dispatcher_unittest.cc
+++ b/ui/events/event_dispatcher_unittest.cc
@@ -38,21 +38,15 @@ class TestTarget : public EventTarget {
 
  private:
   // Overridden from EventTarget:
-  bool CanAcceptEvent(const ui::Event& event) override {
-    return true;
-  }
+  bool CanAcceptEvent(const ui::Event& event) override { return true; }
 
-  EventTarget* GetParentTarget() override {
-    return parent_;
-  }
+  EventTarget* GetParentTarget() override { return parent_; }
 
-  scoped_ptr<EventTargetIterator> GetChildIterator() override {
-    return scoped_ptr<EventTargetIterator>();
+  scoped_ptr<EventTargetIterator> GetChildIterator() const override {
+    return nullptr;
   }
 
-  EventTargeter* GetEventTargeter() override {
-    return NULL;
-  }
+  EventTargeter* GetEventTargeter() override { return NULL; }
 
   TestTarget* parent_;
   std::vector<int> handler_list_;
@@ -177,9 +171,7 @@ class EventHandlerDestroyer : public TestEventHandler {
         dispatcher_delegate_(NULL) {
   }
 
-  ~EventHandlerDestroyer() override {
-    CHECK(!to_destroy_);
-  }
+  ~EventHandlerDestroyer() override { CHECK(!to_destroy_); }
 
   void set_dispatcher_delegate(EventDispatcherDelegate* dispatcher_delegate) {
     dispatcher_delegate_ = dispatcher_delegate;
@@ -255,8 +247,8 @@ TEST(EventDispatcherTest, EventDispatchOrder) {
   h7.set_expect_post_target(true);
   h8.set_expect_post_target(true);
 
-  MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
-                   gfx::Point(3, 4), 0, 0);
+  MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                   ui::EventTimeForNow(), 0, 0);
   Event::DispatcherApi event_mod(&mouse);
   dispatcher.ProcessEvent(&child, &mouse);
   EXPECT_FALSE(mouse.stopped_propagation());
@@ -329,8 +321,8 @@ TEST(EventDispatcherTest, EventDispatchPhase) {
   handler.set_expect_pre_target(true);
   handler.set_expect_post_target(true);
 
-  MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
-                   gfx::Point(3, 4), 0, 0);
+  MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                   ui::EventTimeForNow(), 0, 0);
   Event::DispatcherApi event_mod(&mouse);
   dispatcher.ProcessEvent(&target, &mouse);
   EXPECT_EQ(ER_UNHANDLED, mouse.result());
@@ -361,8 +353,8 @@ TEST(EventDispatcherTest, EventDispatcherDestroyedDuringDispatch) {
     // destroyed the dispatcher.
     h2.set_expect_pre_target(false);
 
-    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
-                     gfx::Point(3, 4), 0, 0);
+    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                     ui::EventTimeForNow(), 0, 0);
     EventDispatchDetails details = dispatcher->ProcessEvent(&target, &mouse);
     EXPECT_TRUE(details.dispatcher_destroyed);
     EXPECT_EQ(ER_CONSUMED, mouse.result());
@@ -413,8 +405,8 @@ TEST(EventDispatcherTest, EventDispatcherDestroyedDuringDispatch) {
     // destroyed the dispatcher.
     h2.set_expect_post_target(false);
 
-    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4),
-                     gfx::Point(3, 4), 0, 0);
+    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                     ui::EventTimeForNow(), 0, 0);
     EventDispatchDetails details = dispatcher->ProcessEvent(&target, &mouse);
     EXPECT_TRUE(details.dispatcher_destroyed);
     EXPECT_EQ(ER_CONSUMED, mouse.result());
@@ -467,8 +459,8 @@ TEST(EventDispatcherTest, EventDispatcherInvalidateTarget) {
   // |h3| should not receive events as the target will be invalidated.
   h3.set_expect_pre_target(false);
 
-  MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0,
-                   0);
+  MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                   ui::EventTimeForNow(), 0, 0);
   EventDispatchDetails details = dispatcher.ProcessEvent(&target, &mouse);
   EXPECT_FALSE(details.dispatcher_destroyed);
   EXPECT_TRUE(details.target_destroyed);
@@ -510,8 +502,8 @@ TEST(EventDispatcherTest, EventHandlerDestroyedDuringDispatch) {
     // destroyed it.
     h3->set_expect_pre_target(false);
 
-    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0,
-                     0);
+    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                     ui::EventTimeForNow(), 0, 0);
     EventDispatchDetails details = dispatcher.ProcessEvent(&target, &mouse);
     EXPECT_FALSE(details.dispatcher_destroyed);
     EXPECT_FALSE(details.target_destroyed);
@@ -568,8 +560,8 @@ TEST(EventDispatcherTest, EventHandlerAndDispatcherDestroyedDuringDispatch) {
     // it.
     h3->set_expect_pre_target(false);
 
-    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4), 0,
-                     0);
+    MouseEvent mouse(ui::ET_MOUSE_MOVED, gfx::Point(3, 4), gfx::Point(3, 4),
+                     ui::EventTimeForNow(), 0, 0);
     EventDispatchDetails details = dispatcher->ProcessEvent(&target, &mouse);
     EXPECT_TRUE(details.dispatcher_destroyed);
     EXPECT_TRUE(mouse.stopped_propagation());