| 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 29974101cd0b775bb6ee225e592df7008b7dde1b..d1eb4b0bf62a5a4d84310eec7e087518870a05a8 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
|
| @@ -1365,9 +1365,10 @@ TEST_F(RenderWidgetHostViewAuraTest, FinishCompositionByMouse) {
|
| sink_->ClearMessages();
|
|
|
| // Simulates the mouse press.
|
| - ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
|
| - 0);
|
| + ui::MouseEvent mouse_event(
|
| + ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
|
| + ui::EF_LEFT_MOUSE_BUTTON, 0,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| view_->OnMouseEvent(&mouse_event);
|
|
|
| EXPECT_FALSE(view_->has_composition_text_);
|
| @@ -4512,29 +4513,33 @@ TEST_F(RenderWidgetHostViewAuraTest, ForwardMouseEvent) {
|
| view_->InitAsChild(parent.get());
|
|
|
| // Simulate mouse events, ensure they are forwarded to delegate.
|
| - ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
|
| - 0);
|
| + ui::MouseEvent mouse_event(
|
| + ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
|
| + ui::EF_LEFT_MOUSE_BUTTON, 0,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| view_->OnMouseEvent(&mouse_event);
|
| EXPECT_EQ("1 0", delegate.GetMouseButtonCountsAndReset());
|
|
|
| // Simulate mouse events, ensure they are forwarded to delegate.
|
| - mouse_event = ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(1, 1),
|
| - gfx::Point(), ui::EventTimeForNow(), 0, 0);
|
| + mouse_event = ui::MouseEvent(
|
| + ui::ET_MOUSE_MOVED, gfx::Point(1, 1), gfx::Point(), ui::EventTimeForNow(),
|
| + 0, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| view_->OnMouseEvent(&mouse_event);
|
| EXPECT_EQ("0 1 0", delegate.GetMouseMotionCountsAndReset());
|
|
|
| // Lock the mouse, simulate, and ensure they are forwarded.
|
| view_->LockMouse();
|
|
|
| - mouse_event =
|
| - ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
|
| - ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
|
| + mouse_event = ui::MouseEvent(
|
| + ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
|
| + ui::EF_LEFT_MOUSE_BUTTON, 0,
|
| + ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| view_->OnMouseEvent(&mouse_event);
|
| EXPECT_EQ("1 0", delegate.GetMouseButtonCountsAndReset());
|
|
|
| - mouse_event = ui::MouseEvent(ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(),
|
| - ui::EventTimeForNow(), 0, 0);
|
| + mouse_event = ui::MouseEvent(
|
| + ui::ET_MOUSE_MOVED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(), 0,
|
| + 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
|
| view_->OnMouseEvent(&mouse_event);
|
| EXPECT_EQ("0 1 0", delegate.GetMouseMotionCountsAndReset());
|
|
|
|
|