Index: ui/events/android/motion_event_android_unittest.cc |
diff --git a/ui/events/android/motion_event_android_unittest.cc b/ui/events/android/motion_event_android_unittest.cc |
index 82ec1c5839886c4404407365a6dcc2a47cc56019..7e619b5d9c8dff412cc897ab456b43ba95090ceb 100644 |
--- a/ui/events/android/motion_event_android_unittest.cc |
+++ b/ui/events/android/motion_event_android_unittest.cc |
@@ -59,8 +59,8 @@ TEST(MotionEventAndroidTest, Constructor) { |
kAndroidAltKeyDown, |
raw_offset, |
-raw_offset, |
- p0, |
- p1); |
+ &p0, |
+ &p1); |
EXPECT_EQ(MotionEvent::ACTION_DOWN, event.GetAction()); |
EXPECT_EQ(event_time, event.GetEventTime()); |
@@ -85,7 +85,7 @@ TEST(MotionEventAndroidTest, Constructor) { |
EXPECT_EQ(MotionEvent::TOOL_TYPE_FINGER, event.GetToolType(0)); |
EXPECT_EQ(MotionEvent::TOOL_TYPE_FINGER, event.GetToolType(1)); |
EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState()); |
- EXPECT_EQ(ui::EF_ALT_DOWN, event.GetFlags()); |
+ EXPECT_EQ(ui::EF_ALT_DOWN | ui::EF_LEFT_MOUSE_BUTTON, event.GetFlags()); |
EXPECT_EQ(static_cast<size_t>(pointer_count), event.GetPointerCount()); |
EXPECT_EQ(static_cast<size_t>(history_size), event.GetHistorySize()); |
} |
@@ -94,7 +94,6 @@ TEST(MotionEventAndroidTest, Clone) { |
const int pointer_count = 1; |
MotionEventAndroid::Pointer p0( |
1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger); |
- MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0); |
MotionEventAndroid event(kPixToDip, |
base::android::AttachCurrentThread(), |
nullptr, |
@@ -107,8 +106,8 @@ TEST(MotionEventAndroidTest, Clone) { |
0, |
0, |
0, |
- p0, |
- p1); |
+ &p0, |
+ nullptr); |
std::unique_ptr<MotionEvent> clone = event.Clone(); |
EXPECT_EQ(ui::test::ToString(event), ui::test::ToString(*clone)); |
@@ -119,7 +118,6 @@ TEST(MotionEventAndroidTest, Cancel) { |
const int pointer_count = 1; |
MotionEventAndroid::Pointer p0( |
1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger); |
- MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0); |
MotionEventAndroid event(kPixToDip, |
base::android::AttachCurrentThread(), |
nullptr, |
@@ -132,8 +130,8 @@ TEST(MotionEventAndroidTest, Cancel) { |
0, |
0, |
0, |
- p0, |
- p1); |
+ &p0, |
+ nullptr); |
std::unique_ptr<MotionEvent> cancel_event = event.Cancel(); |
EXPECT_EQ(MotionEvent::ACTION_CANCEL, cancel_event->GetAction()); |
@@ -165,8 +163,8 @@ TEST(MotionEventAndroidTest, InvalidOrientationsSanitized) { |
0, |
0, |
0, |
- p0, |
- p1); |
+ &p0, |
+ &p1); |
EXPECT_EQ(0.f, event.GetOrientation(0)); |
EXPECT_EQ(0.f, event.GetOrientation(1)); |
@@ -176,7 +174,6 @@ TEST(MotionEventAndroidTest, NonEmptyHistoryForNonMoveEventsSanitized) { |
int pointer_count = 1; |
size_t history_size = 5; |
MotionEventAndroid::Pointer p0(0, 0, 0, 0, 0, 0, 0, 0); |
- MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0); |
MotionEventAndroid event(kPixToDip, |
base::android::AttachCurrentThread(), |
nullptr, |
@@ -189,8 +186,8 @@ TEST(MotionEventAndroidTest, NonEmptyHistoryForNonMoveEventsSanitized) { |
0, |
0, |
0, |
- p0, |
- p1); |
+ &p0, |
+ nullptr); |
EXPECT_EQ(0U, event.GetHistorySize()); |
} |
@@ -215,8 +212,8 @@ TEST(MotionEventAndroidTest, ActionIndexForPointerDown) { |
0, |
0, |
0, |
- p0, |
- p1); |
+ &p0, |
+ &p1); |
EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction()); |
EXPECT_EQ(action_index, event.GetActionIndex()); |