| 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 f3de1ddceee8408c8d96a0a43824e0537316f7f0..058efdb40dc803fdc0ee8f0c5ff10fbb5020fdfa 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;
|
| }
|
| @@ -87,16 +86,6 @@ MockMotionEvent::MockMotionEvent(const MockMotionEvent& other)
|
|
|
| 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.Pass();
|
| -}
|
| -
|
| void MockMotionEvent::PressPoint(float x, float y) {
|
| ResolvePointers();
|
| PushPointer(x, y);
|
|
|