Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods.

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 281 matching lines @@
     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);
+  move1.set_location(gfx::Point(20, 21));

[jdduke (slow), 2015/01/06 16:49:54]

Can we get an additional test or 2 (or 3) covering the additional logic in
MotionEventAura?

[tdresser, 2015/01/07 17:01:15]

Done.

   event.OnTouch(move1);
 
   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(MotionEventAuraTest, Timestamps) {
   // Test that timestamp information is stored and converted correctly.
   MotionEventAura event;
   int ids[] = {7, 13};
   int times_in_ms[] = {59436, 60263, 82175};
 
   TouchEvent press0 = TouchWithTime(
       ui::ET_TOUCH_PRESSED, ids[0], times_in_ms[0]);
   event.OnTouch(press0);
   EXPECT_EQ(MsToTicks(times_in_ms[0]), event.GetEventTime());
 
   TouchEvent press1 = TouchWithTime(
       ui::ET_TOUCH_PRESSED, ids[1], times_in_ms[1]);
   event.OnTouch(press1);
   EXPECT_EQ(MsToTicks(times_in_ms[1]), event.GetEventTime());
 
   TouchEvent move0 = TouchWithTime(
       ui::ET_TOUCH_MOVED, ids[0], times_in_ms[2]);
+  move0.set_location(gfx::PointF(12, 21));
   event.OnTouch(move0);
   EXPECT_EQ(MsToTicks(times_in_ms[2]), event.GetEventTime());
 
   // Test cloning of timestamp information.
   scoped_ptr<MotionEvent> clone = event.Clone();
   EXPECT_EQ(MsToTicks(times_in_ms[2]), clone->GetEventTime());
 }
 
 TEST(MotionEventAuraTest, CachedAction) {
   // Test that the cached action and cached action index are correct.
@@ skipping 10 matching lines @@
   EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
   EXPECT_EQ(1, event.GetActionIndex());
   EXPECT_EQ(2U, event.GetPointerCount());
 
   // Test cloning of CachedAction information.
   scoped_ptr<MotionEvent> clone = event.Clone();
   EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, clone->GetAction());
   EXPECT_EQ(1, clone->GetActionIndex());
 
   TouchEvent move0 = TouchWithType(ET_TOUCH_MOVED, ids[0]);
+  move0.set_location(gfx::PointF(10, 12));
   event.OnTouch(move0);
   EXPECT_EQ(MotionEvent::ACTION_MOVE, event.GetAction());
   EXPECT_EQ(2U, event.GetPointerCount());
 
   TouchEvent release0 = TouchWithType(ET_TOUCH_RELEASED, ids[0]);
   event.OnTouch(release0);
   EXPECT_EQ(MotionEvent::ACTION_POINTER_UP, event.GetAction());
   EXPECT_EQ(2U, event.GetPointerCount());
   event.CleanupRemovedTouchPoints(release0);
   EXPECT_EQ(1U, event.GetPointerCount());
@@ skipping 46 matching lines @@
   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