Remove abstract Clone and Cancel methods from MotionEvent

ui/events/test/mock_motion_event.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/test/mock_motion_event.h"
 
 #include "base/logging.h"
 
 using base::TimeTicks;
 
 namespace ui {
 namespace test {
 namespace {
 
 PointerProperties CreatePointer() {
   PointerProperties pointer;
   pointer.touch_major = MockMotionEvent::TOUCH_MAJOR;
   return pointer;
 }
 
 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;
 }
 
 
 }  // namespace
 
 MockMotionEvent::MockMotionEvent()
     : MotionEventGeneric(ACTION_CANCEL, base::TimeTicks(), CreatePointer()) {
 }
@@ skipping 46 matching lines @@
   for (size_t i = 0; i < positions.size(); ++i)
     PushPointer(positions[i].x(), positions[i].y());
 }
 
 MockMotionEvent::MockMotionEvent(const MockMotionEvent& other)
     : MotionEventGeneric(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);
   if (GetPointerCount() > 1) {
     set_action_index(static_cast<int>(GetPointerCount()) - 1);
     set_action(ACTION_POINTER_DOWN);
   } else {
     set_action(ACTION_DOWN);
   }
 }
@@ skipping 58 matching lines @@
     case ACTION_CANCEL:
       PopPointer();
       return;
     default:
       break;
   }
 }
 
 }  // namespace test
 }  // namespace ui