Remove abstract Clone and Cancel methods from MotionEvent

ui/events/gesture_detection/motion_event_buffer_unittest.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 "base/basictypes.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/gesture_detection/motion_event_buffer.h"
-#include "ui/events/test/mock_motion_event.h"
+#include "ui/events/test/motion_event_test_utils.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using ui::test::MockMotionEvent;
 
 namespace ui {
 
 const int kSmallDeltaMs = 1;
 const int kLargeDeltaMs = 50;
 const int kResampleDeltaMs = 5;
@@ skipping 13 matching lines @@
 #define EXPECT_EVENT_HISTORY_EQ(A, I, B)     \
   {                                          \
     SCOPED_TRACE(testing::Message());        \
     ExpectEqualsHistoryIndex((A), (I), (B)); \
   }
 
 class MotionEventBufferTest : public testing::Test,
                               public MotionEventBufferClient {
  public:
   MotionEventBufferTest() : needs_flush_(false) {}
-  virtual ~MotionEventBufferTest() {}
+  ~MotionEventBufferTest() override {}
 
   // MotionEventBufferClient implementation.
-  virtual void ForwardMotionEvent(const MotionEvent& event) override {
+  void ForwardMotionEvent(const MotionEvent& event) override {
     forwarded_events_.push_back(event.Clone().release());
   }
 
-  virtual void SetNeedsFlush() override { needs_flush_ = true; }
+  void SetNeedsFlush() override { needs_flush_ = true; }
 
   bool GetAndResetNeedsFlush() {
     bool needs_flush = needs_flush_;
     needs_flush_ = false;
     return needs_flush;
   }
 
   ScopedVector<MotionEvent> GetAndResetForwardedEvents() {
     ScopedVector<MotionEvent> forwarded_events;
     forwarded_events.swap(forwarded_events_);
@@ skipping 275 matching lines @@
   // The flushed event should only include the latest move event.
   buffer.Flush(event_time);
   ScopedVector<MotionEvent> events = GetAndResetForwardedEvents();
   ASSERT_EQ(3U, events.size());
   EXPECT_EVENT_EQ(move2, *events.back());
   EXPECT_FALSE(GetAndResetNeedsFlush());
 
   event_time += base::TimeDelta::FromMilliseconds(5);
 
   // Events with different pointer ids should not combine.
-  PointerProperties pointer0(5.f, 5.f);
+  PointerProperties pointer0(5.f, 5.f, 1.f);
   pointer0.id = 1;
-  PointerProperties pointer1(10.f, 10.f);
+  PointerProperties pointer1(10.f, 10.f, 2.f);
   pointer1.id = 2;
   MotionEventGeneric move3(MotionEvent::ACTION_MOVE, event_time, pointer0);
   move3.PushPointer(pointer1);
   buffer.OnMotionEvent(move3);
   ASSERT_FALSE(GetLastEvent());
   EXPECT_TRUE(GetAndResetNeedsFlush());
 
   MotionEventGeneric move4(MotionEvent::ACTION_MOVE, event_time, pointer0);
   pointer1.id = 7;
   move4.PushPointer(pointer1);
@@ skipping 40 matching lines @@
   buffer.Flush(flush_time);
   EXPECT_FALSE(GetAndResetNeedsFlush());
   ASSERT_TRUE(GetLastEvent());
   EXPECT_EVENT_EQ(move, *GetLastEvent());
 }
 
 TEST_F(MotionEventBufferTest, OutOfOrderPointersBuffered) {
   base::TimeTicks event_time = base::TimeTicks::Now();
   MotionEventBuffer buffer(this, true);
 
-  PointerProperties p0(1.f, 2.f);
+  PointerProperties p0(1.f, 2.f, 3.f);
   p0.id = 1;
-  PointerProperties p1(2.f, 1.f);
+  PointerProperties p1(2.f, 1.f, 0.5f);
   p1.id = 2;
 
   MotionEventGeneric move0(MotionEvent::ACTION_MOVE, event_time, p0);
   move0.PushPointer(p1);
   buffer.OnMotionEvent(move0);
   EXPECT_TRUE(GetAndResetNeedsFlush());
   ASSERT_FALSE(GetLastEvent());
 
   event_time += base::TimeDelta::FromMilliseconds(5);
 
@@ skipping 439 matching lines @@
 TEST_F(MotionEventBufferTest, Resampling150to60) {
   base::TimeDelta flush_time_delta =
       base::TimeDelta::FromMillisecondsD(1000. / 60.);
   base::TimeDelta event_time_delta =
       base::TimeDelta::FromMillisecondsD(1000. / 150.);
 
   RunResample(flush_time_delta, event_time_delta);
 }
 
 }  // namespace ui