Use new WebTouchPoint field names.

content/browser/renderer_host/input/web_input_event_util_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.
 
 // Needed on Windows to get |M_PI| from <cmath>.
 #ifdef _WIN32
 #define _USE_MATH_DEFINES
 #endif
 
 #include <cmath>
@@ skipping 29 matching lines @@
   event.set_flags(ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
   event.set_unique_event_id(123456U);
 
   WebTouchEvent expected_event;
   expected_event.type = WebInputEvent::TouchStart;
   expected_event.touchesLength = 1;
   expected_event.timeStampSeconds =
       (event.GetEventTime() - base::TimeTicks()).InSecondsF();
   expected_event.modifiers = WebInputEvent::ShiftKey | WebInputEvent::AltKey;
   WebTouchPoint expected_pointer;
-  expected_pointer.id = pointer.id;
+  expected_pointer.pointerId = pointer.id;
   expected_pointer.state = WebTouchPoint::StatePressed;
   expected_pointer.position = blink::WebFloatPoint(pointer.x, pointer.y);
   expected_pointer.screenPosition =
       blink::WebFloatPoint(pointer.raw_x, pointer.raw_y);
-  expected_pointer.radiusX = pointer.touch_major / 2.f;
-  expected_pointer.radiusY = pointer.touch_minor / 2.f;
+  expected_pointer.width = pointer.touch_major / 2.f;
+  expected_pointer.height = pointer.touch_minor / 2.f;
   expected_pointer.rotationAngle = 0.f;
-  expected_pointer.force = pointer.pressure;
+  expected_pointer.pressure = pointer.pressure;
   expected_event.touches[0] = expected_pointer;
   expected_event.uniqueTouchEventId = 123456U;
 
   WebTouchEvent actual_event =
       ui::CreateWebTouchEventFromMotionEvent(event, false);
   EXPECT_EQ(WebInputEventTraits::ToString(expected_event),
             WebInputEventTraits::ToString(actual_event));
 }
 
 TEST(WebInputEventUtilTest, ScrollUpdateConversion) {
@@ skipping 32 matching lines @@
   EXPECT_EQ(gfx::ToFlooredInt(pos.y()), web_event.y);
   EXPECT_EQ(gfx::ToFlooredInt(raw_pos.x()), web_event.globalX);
   EXPECT_EQ(gfx::ToFlooredInt(raw_pos.y()), web_event.globalY);
   EXPECT_EQ(blink::WebGestureDeviceTouchscreen, web_event.sourceDevice);
   EXPECT_EQ(delta.x(), web_event.data.scrollUpdate.deltaX);
   EXPECT_EQ(delta.y(), web_event.data.scrollUpdate.deltaY);
   EXPECT_TRUE(web_event.data.scrollUpdate.previousUpdateInSequencePrevented);
 }
 
 }  // namespace content