Remove abstract Clone and Cancel methods from MotionEvent

ui/events/gestures/motion_event_aura_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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 120 matching lines @@
   // been removed.
   int ids[] = {4, 6, 9};
 
   MotionEventAura event;
   EXPECT_EQ(0U, event.GetPointerCount());
 
   TouchEvent press0 = TouchWithType(ET_TOUCH_PRESSED, ids[0]);
   event.OnTouch(press0);
   TouchEvent press1 = TouchWithType(ET_TOUCH_PRESSED, ids[1]);
   event.OnTouch(press1);
+  EXPECT_EQ(1, event.GetActionIndex());
   TouchEvent press2 = TouchWithType(ET_TOUCH_PRESSED, ids[2]);
   event.OnTouch(press2);
+  EXPECT_EQ(2, event.GetActionIndex());
   EXPECT_EQ(3U, event.GetPointerCount());
 
   TouchEvent release1 = TouchWithType(ET_TOUCH_RELEASED, ids[1]);
   event.OnTouch(release1);
+  EXPECT_EQ(1, event.GetActionIndex());
   event.CleanupRemovedTouchPoints(release1);
-  EXPECT_EQ(1, event.GetActionIndex());
   EXPECT_EQ(2U, event.GetPointerCount());
 
   TouchEvent release2 = TouchWithType(ET_TOUCH_RELEASED, ids[0]);
   event.OnTouch(release2);
+  EXPECT_EQ(0, event.GetActionIndex());
   event.CleanupRemovedTouchPoints(release2);
-  EXPECT_EQ(0, event.GetActionIndex());
   EXPECT_EQ(1U, event.GetPointerCount());
 
   TouchEvent release0 = TouchWithType(ET_TOUCH_RELEASED, ids[2]);
   event.OnTouch(release0);
   event.CleanupRemovedTouchPoints(release0);
   EXPECT_EQ(0U, event.GetPointerCount());
 }
 
 TEST(MotionEventAuraTest, PointerLocations) {
   // Test that location information is stored correctly.
@@ skipping 32 matching lines @@
 
   EXPECT_EQ(2U, event.GetPointerCount());
   EXPECT_FLOAT_EQ(x, event.GetX(1));
   EXPECT_FLOAT_EQ(y, event.GetY(1));
   EXPECT_FLOAT_EQ(raw_x, event.GetRawX(1));
   EXPECT_FLOAT_EQ(raw_y, event.GetRawY(1));
 
   // Test cloning of pointer location information.
   scoped_ptr<MotionEvent> clone = event.Clone();
   {
-    const MotionEventAura* raw_clone_aura =
-        static_cast<MotionEventAura*>(clone.get());
-    EXPECT_EQ(2U, raw_clone_aura->GetPointerCount());
-    EXPECT_FLOAT_EQ(x, raw_clone_aura->GetX(1));
-    EXPECT_FLOAT_EQ(y, raw_clone_aura->GetY(1));
-    EXPECT_FLOAT_EQ(raw_x, raw_clone_aura->GetRawX(1));
-    EXPECT_FLOAT_EQ(raw_y, raw_clone_aura->GetRawY(1));
+    EXPECT_EQ(2U, clone->GetPointerCount());
+    EXPECT_FLOAT_EQ(x, clone->GetX(1));
+    EXPECT_FLOAT_EQ(y, clone->GetY(1));
+    EXPECT_FLOAT_EQ(raw_x, clone->GetRawX(1));
+    EXPECT_FLOAT_EQ(raw_y, clone->GetRawY(1));
   }
 
   x = 27.9f;
   y = 22.3f;
   raw_x = x + kRawOffsetX;
   raw_y = y + kRawOffsetY;
   TouchEvent move1 =
       TouchWithPosition(ET_TOUCH_MOVED, ids[1], x, y, raw_x, raw_y);
   event.OnTouch(move1);
 
@@ skipping 51 matching lines @@
 
   EXPECT_EQ(2U, event.GetPointerCount());
   EXPECT_FLOAT_EQ(radius_y, event.GetTouchMajor(1) / 2);
   EXPECT_FLOAT_EQ(radius_x, event.GetTouchMinor(1) / 2);
   EXPECT_FLOAT_EQ(rotation_angle, event.GetOrientation(1) * 180 / M_PI);
   EXPECT_FLOAT_EQ(pressure, event.GetPressure(1));
 
   // Test cloning of tap params
   scoped_ptr<MotionEvent> clone = event.Clone();
   {
-    const MotionEventAura* raw_clone_aura =
-        static_cast<MotionEventAura*>(clone.get());
-    EXPECT_EQ(2U, raw_clone_aura->GetPointerCount());
-    EXPECT_FLOAT_EQ(radius_y, raw_clone_aura->GetTouchMajor(1) / 2);
-    EXPECT_FLOAT_EQ(radius_x, raw_clone_aura->GetTouchMinor(1) / 2);
-    EXPECT_FLOAT_EQ(
-        rotation_angle, raw_clone_aura->GetOrientation(1) * 180 / M_PI);
-    EXPECT_FLOAT_EQ(pressure, raw_clone_aura->GetPressure(1));
+    EXPECT_EQ(2U, clone->GetPointerCount());
+    EXPECT_FLOAT_EQ(radius_y, clone->GetTouchMajor(1) / 2);
+    EXPECT_FLOAT_EQ(radius_x, clone->GetTouchMinor(1) / 2);
+    EXPECT_FLOAT_EQ(rotation_angle, clone->GetOrientation(1) * 180 / M_PI);
+    EXPECT_FLOAT_EQ(pressure, clone->GetPressure(1));
   }
 
   radius_x = 76.98f;
   radius_y = 321.54f;
   rotation_angle = 64.f;
   pressure = 0.654f;
   TouchEvent move1 = TouchWithTapParams(
       ET_TOUCH_MOVED, ids[1], radius_x, radius_y, rotation_angle, pressure);
   event.OnTouch(move1);
 
@@ skipping 81 matching lines @@
   EXPECT_EQ(1U, event.GetPointerCount());
 
   TouchEvent press1 = TouchWithType(ET_TOUCH_PRESSED, ids[1]);
   event.OnTouch(press1);
   EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
   EXPECT_EQ(1, event.GetActionIndex());
   EXPECT_EQ(2U, event.GetPointerCount());
 
   scoped_ptr<MotionEvent> cancel = event.Cancel();
   EXPECT_EQ(MotionEvent::ACTION_CANCEL, cancel->GetAction());
-  EXPECT_EQ(2U, static_cast<MotionEventAura*>(cancel.get())->GetPointerCount());
+  EXPECT_EQ(2U, cancel->GetPointerCount());
 }
 
 TEST(MotionEventAuraTest, ToolType) {
   MotionEventAura event;
 
   // For now, all pointers have an unknown tool type.
   // TODO(jdduke): Expand this test when ui::TouchEvent identifies the source
   // touch type, crbug.com/404128.
   event.OnTouch(TouchWithType(ET_TOUCH_PRESSED, 7));
   ASSERT_EQ(1U, event.GetPointerCount());
   EXPECT_EQ(MotionEvent::TOOL_TYPE_UNKNOWN, event.GetToolType(0));
 }
 
 TEST(MotionEventAuraTest, Flags) {
   int ids[] = {7, 11};
   MotionEventAura event;
 
   TouchEvent press0 = TouchWithType(ET_TOUCH_PRESSED, ids[0]);
   press0.set_flags(EF_CONTROL_DOWN);
   event.OnTouch(press0);
   EXPECT_EQ(EF_CONTROL_DOWN, event.GetFlags());
 
   TouchEvent press1 = TouchWithType(ET_TOUCH_PRESSED, ids[1]);
   press1.set_flags(EF_CONTROL_DOWN | EF_CAPS_LOCK_DOWN);
   event.OnTouch(press1);
   EXPECT_EQ(EF_CONTROL_DOWN | EF_CAPS_LOCK_DOWN, event.GetFlags());
 }
 
 }  // namespace ui