Drop ui::TouchEvent shims for radius_{x,y} and force

ui/events/gestures/motion_event_aura.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/gestures/motion_event_aura.h"
 
 #include "base/logging.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace ui {
 namespace {
 
 PointerProperties GetPointerPropertiesFromTouchEvent(const TouchEvent& touch) {
   PointerProperties pointer_properties;
   pointer_properties.x = touch.x();
   pointer_properties.y = touch.y();
   pointer_properties.raw_x = touch.root_location_f().x();
   pointer_properties.raw_y = touch.root_location_f().y();
   pointer_properties.id = touch.touch_id();
-  pointer_properties.pressure = touch.force();
+  pointer_properties.pressure = touch.pointer_details().force();
   pointer_properties.source_device_id = touch.source_device_id();
 
-  pointer_properties.SetAxesAndOrientation(touch.radius_x(), touch.radius_y(),
+  pointer_properties.SetAxesAndOrientation(touch.pointer_details().radius_x(),
+                                           touch.pointer_details().radius_y(),
                                            touch.rotation_angle());
   if (!pointer_properties.touch_major) {
     pointer_properties.touch_major =
         2.f * GestureConfiguration::GetInstance()->default_radius();
     pointer_properties.touch_minor =
         2.f * GestureConfiguration::GetInstance()->default_radius();
     pointer_properties.orientation = 0;
   }
 
   // TODO(jdduke): Plumb tool type from the platform, crbug.com/404128.
@@ skipping 127 matching lines @@
 }
 
 int MotionEventAura::GetIndexFromId(int id) const {
   int index = FindPointerIndexOfId(id);
   DCHECK_GE(index, 0);
   DCHECK_LT(index, static_cast<int>(GetPointerCount()));
   return index;
 }
 
 }  // namespace ui