Index: content/browser/web_contents/touch_editable_impl_aura_browsertest.cc |
diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc |
index 370e4c7b0e6d512864d1af392d37743c17641560..c159d5f5272f9a639f05e8bec1f11046a83ca130 100644 |
--- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc |
+++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc |
@@ -229,7 +229,7 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
10, |
0, |
ui::EventTimeForNow(), |
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0)); |
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS)); |
touch_editable->Reset(); |
rwhva->OnGestureEvent(&long_press); |
touch_editable->WaitForSelectionChangeCallback(); |
@@ -249,7 +249,7 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
10, |
0, |
ui::EventTimeForNow(), |
- ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN, 0, 0)); |
+ ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_BEGIN)); |
rwhva->OnGestureEvent(&scroll_begin); |
EXPECT_FALSE(GetTouchSelectionController(touch_editable)); |
@@ -259,7 +259,7 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
10, |
0, |
ui::EventTimeForNow(), |
- ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END, 0, 0)); |
+ ui::GestureEventDetails(ui::ET_GESTURE_SCROLL_END)); |
rwhva->OnGestureEvent(&scroll_end); |
EXPECT_TRUE(GetTouchSelectionController(touch_editable)); |
} |
@@ -284,7 +284,7 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
10, |
0, |
ui::EventTimeForNow(), |
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0)); |
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS)); |
touch_editable->Reset(); |
rwhva->OnGestureEvent(&long_press); |
touch_editable->WaitForSelectionChangeCallback(); |
@@ -340,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
10, |
0, |
ui::EventTimeForNow(), |
- ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS, 0, 0)); |
+ ui::GestureEventDetails(ui::ET_GESTURE_LONG_PRESS)); |
touch_editable->Reset(); |
rwhva->OnGestureEvent(&long_press); |
touch_editable->WaitForSelectionChangeCallback(); |
@@ -370,12 +370,9 @@ IN_PROC_BROWSER_TEST_F(TouchEditableImplAuraTest, |
EXPECT_EQ(GetRenderWidgetHostViewAura(touch_editable), rwhva); |
// Double-tap to select word. |
- ui::GestureEvent double_tap( |
- 10, |
- 10, |
- 0, |
- ui::EventTimeForNow(), |
- ui::GestureEventDetails(ui::ET_GESTURE_TAP, 2, 0)); |
+ ui::GestureEventDetails details(ui::ET_GESTURE_TAP); |
+ details.set_tap_count(2); |
+ ui::GestureEvent double_tap(10, 10, 0, ui::EventTimeForNow(), details); |
touch_editable->Reset(); |
rwhva->OnGestureEvent(&double_tap); |
touch_editable->WaitForSelectionChangeCallback(); |