Index: ui/events/test/mock_motion_event.cc |
diff --git a/ui/events/test/mock_motion_event.cc b/ui/events/test/mock_motion_event.cc |
index 24d81596bc62629f73accd78aa7110abc3d78292..3842a860b42bf083663a955f06ed9d58e25c7020 100644 |
--- a/ui/events/test/mock_motion_event.cc |
+++ b/ui/events/test/mock_motion_event.cc |
@@ -19,8 +19,7 @@ PointerProperties CreatePointer() { |
} |
PointerProperties CreatePointer(float x, float y, int id) { |
- PointerProperties pointer(x, y); |
- pointer.touch_major = MockMotionEvent::TOUCH_MAJOR; |
+ PointerProperties pointer(x, y, MockMotionEvent::TOUCH_MAJOR); |
pointer.id = id; |
return pointer; |
} |
@@ -81,22 +80,12 @@ MockMotionEvent::MockMotionEvent(Action action, |
PushPointer(positions[i].x(), positions[i].y()); |
} |
-MockMotionEvent::MockMotionEvent(const MockMotionEvent& other) |
- : MotionEventGeneric(other) { |
+MockMotionEvent::MockMotionEvent(const MockMotionEvent& event) |
+ : MotionEventGeneric(event) { |
} |
MockMotionEvent::~MockMotionEvent() {} |
-scoped_ptr<MotionEvent> MockMotionEvent::Clone() const { |
- return scoped_ptr<MotionEvent>(new MockMotionEvent(*this)); |
-} |
- |
-scoped_ptr<MotionEvent> MockMotionEvent::Cancel() const { |
- scoped_ptr<MockMotionEvent> event(new MockMotionEvent(*this)); |
- event->set_action(MotionEvent::ACTION_CANCEL); |
- return event.PassAs<MotionEvent>(); |
-} |
- |
void MockMotionEvent::PressPoint(float x, float y) { |
ResolvePointers(); |
PushPointer(x, y); |