| Index: ui/events/scoped_target_handler_unittest.cc
|
| diff --git a/ui/events/scoped_target_handler_unittest.cc b/ui/events/scoped_target_handler_unittest.cc
|
| index 9eae471f3938afeb70b478882fac8c79ac55f903..54666ca3d3341972fd3c18011d47183fd72d0909 100644
|
| --- a/ui/events/scoped_target_handler_unittest.cc
|
| +++ b/ui/events/scoped_target_handler_unittest.cc
|
| @@ -147,9 +147,10 @@ TEST(ScopedTargetHandlerTest, HandlerInvoked) {
|
| std::unique_ptr<EventCountingEventHandler> delegate(
|
| new EventCountingEventHandler(target, &count));
|
| target->SetHandler(std::move(target_handler), std::move(delegate));
|
| - MouseEvent event(ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - EventTimeForNow(), EF_LEFT_MOUSE_BUTTON,
|
| - EF_LEFT_MOUSE_BUTTON);
|
| + MouseEvent event(
|
| + ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), EventTimeForNow(),
|
| + EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| target->DispatchEvent(&event);
|
| EXPECT_EQ(1, count);
|
| delete target;
|
| @@ -165,9 +166,10 @@ TEST(ScopedTargetHandlerTest, HandlerInvokedNested) {
|
| std::unique_ptr<EventCountingEventHandler> delegate(
|
| new EventCountingEventHandler(target, &count));
|
| target->SetHandler(std::move(target_handler), std::move(delegate));
|
| - MouseEvent event(ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - EventTimeForNow(), EF_LEFT_MOUSE_BUTTON,
|
| - EF_LEFT_MOUSE_BUTTON);
|
| + MouseEvent event(
|
| + ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), EventTimeForNow(),
|
| + EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| target->DispatchEvent(&event);
|
| EXPECT_EQ(2, count);
|
| delete target;
|
| @@ -183,9 +185,10 @@ TEST(ScopedTargetHandlerTest, SafeToDestroy) {
|
| std::unique_ptr<EventCountingEventHandler> delegate(
|
| new EventCountingEventHandler(target, &count));
|
| target->SetHandler(std::move(target_handler), std::move(delegate));
|
| - MouseEvent event(ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - EventTimeForNow(), EF_LEFT_MOUSE_BUTTON,
|
| - EF_LEFT_MOUSE_BUTTON);
|
| + MouseEvent event(
|
| + ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), EventTimeForNow(),
|
| + EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| target->DispatchEvent(&event);
|
| EXPECT_EQ(0, count);
|
| }
|
| @@ -200,9 +203,10 @@ TEST(ScopedTargetHandlerTest, SafeToDestroyNested) {
|
| std::unique_ptr<EventCountingEventHandler> delegate(
|
| new EventCountingEventHandler(target, &count));
|
| target->SetHandler(std::move(target_handler), std::move(delegate));
|
| - MouseEvent event(ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - EventTimeForNow(), EF_LEFT_MOUSE_BUTTON,
|
| - EF_LEFT_MOUSE_BUTTON);
|
| + MouseEvent event(
|
| + ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), EventTimeForNow(),
|
| + EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| target->DispatchEvent(&event);
|
| EXPECT_EQ(0, count);
|
| }
|
|
|