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

ui/events/event_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
@@ skipping 531 matching lines @@
 }
 #endif  // USE_X11 || OS_WIN
 
 TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
   const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0);
   const float non_zero_length1 = 30;
   const float non_zero_length2 = 46;
 
   TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
                     non_zero_length1, 0, 0, 0);
-  EXPECT_EQ(non_zero_length1, event1.radius_x());
-  EXPECT_EQ(non_zero_length1, event1.radius_y());
+  EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_x());
+  EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_y());
 
   TouchEvent event2(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
                     0, non_zero_length2, 0, 0);
-  EXPECT_EQ(non_zero_length2, event2.radius_x());
-  EXPECT_EQ(non_zero_length2, event2.radius_y());
+  EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_x());
+  EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_y());
 }
 
 TEST(EventTest, TouchEventRotationAngleFixing) {
   const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0);
   const float radius_x = 20;
   const float radius_y = 10;
 
   {
     const float angle_in_range = 0;
     TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
@@ skipping 42 matching lines @@
                                    ui::EventTimeForNow());
 
   EXPECT_EQ(EventPointerType::POINTER_TYPE_TOUCH,
             touch_event_plain.pointer_details().pointer_type());
   EXPECT_EQ(0.0f, touch_event_plain.pointer_details().radius_x());
   EXPECT_EQ(0.0f, touch_event_plain.pointer_details().radius_y());
   EXPECT_EQ(0.0f, touch_event_plain.pointer_details().force());
   EXPECT_EQ(0.0f, touch_event_plain.pointer_details().tilt_x());
   EXPECT_EQ(0.0f, touch_event_plain.pointer_details().tilt_y());
 
-  EXPECT_EQ(0.0f, touch_event_plain.radius_x());
-  EXPECT_EQ(0.0f, touch_event_plain.radius_y());
-  EXPECT_EQ(0.0f, touch_event_plain.force());
-
   ui::TouchEvent touch_event_with_details(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0,
                                           0, ui::EventTimeForNow(), 10.0f, 5.0f,
                                           0.0f, 15.0f);
 
   EXPECT_EQ(EventPointerType::POINTER_TYPE_TOUCH,
             touch_event_with_details.pointer_details().pointer_type());
   EXPECT_EQ(10.0f, touch_event_with_details.pointer_details().radius_x());
   EXPECT_EQ(5.0f, touch_event_with_details.pointer_details().radius_y());
   EXPECT_EQ(15.0f, touch_event_with_details.pointer_details().force());
   EXPECT_EQ(0.0f, touch_event_with_details.pointer_details().tilt_x());
@@ skipping 54 matching lines @@
   EXPECT_EQ(EventPointerType::POINTER_TYPE_PEN,
             stylus_event_copy.pointer_details().pointer_type());
   EXPECT_EQ(21.0f, stylus_event_copy.pointer_details().force());
   EXPECT_EQ(45.0f, stylus_event_copy.pointer_details().tilt_x());
   EXPECT_EQ(-45.0f, stylus_event_copy.pointer_details().tilt_y());
   EXPECT_EQ(0.0f, stylus_event_copy.pointer_details().radius_x());
   EXPECT_EQ(0.0f, stylus_event_copy.pointer_details().radius_y());
 }
 
 }  // namespace ui