Use new WebTouchPoint field names.

content/renderer/pepper/event_conversion_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.
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/renderer/pepper/event_conversion.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class EventConversionTest : public ::testing::Test {
  protected:
   void CompareWebTouchEvents(const blink::WebTouchEvent& expected,
                              const blink::WebTouchEvent& actual) {
     EXPECT_EQ(expected.type, actual.type);
     ASSERT_EQ(expected.touchesLength, actual.touchesLength);
     for (size_t i = 0; i < expected.touchesLength; ++i) {
       size_t j = 0;
       for (; j < actual.touchesLength; ++j) {
-        if (actual.touches[j].id == expected.touches[i].id)
+        if (actual.touches[j].pointerId == expected.touches[i].pointerId)
           break;
       }
       ASSERT_NE(j, actual.touchesLength);
-      EXPECT_EQ(expected.touches[i].id, actual.touches[j].id);
+      EXPECT_EQ(expected.touches[i].pointerId, actual.touches[j].pointerId);
       EXPECT_EQ(expected.touches[i].state, actual.touches[j].state);
       EXPECT_EQ(expected.touches[i].position.x, actual.touches[j].position.x);
       EXPECT_EQ(expected.touches[i].position.y, actual.touches[j].position.y);
-      EXPECT_EQ(expected.touches[i].radiusX, actual.touches[j].radiusX);
-      EXPECT_EQ(expected.touches[i].radiusY, actual.touches[j].radiusY);
+      EXPECT_EQ(expected.touches[i].width, actual.touches[j].width);
+      EXPECT_EQ(expected.touches[i].height, actual.touches[j].height);
       EXPECT_EQ(expected.touches[i].rotationAngle,
                 actual.touches[j].rotationAngle);
-      EXPECT_EQ(expected.touches[i].force, actual.touches[j].force);
+      EXPECT_EQ(expected.touches[i].pressure, actual.touches[j].pressure);
     }
   }
 };
 
 TEST_F(EventConversionTest, TouchStart) {
   SyntheticWebTouchEvent touch;
   touch.PressPoint(1.f, 2.f);
 
   std::vector<ppapi::InputEventData> pp_events;
   CreateInputEventData(touch, &pp_events);
@@ skipping 90 matching lines @@
   scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
   const blink::WebTouchEvent* touch_out =
       static_cast<const blink::WebTouchEvent*>(event_out.get());
   ASSERT_TRUE(touch_out);
   EXPECT_EQ(touch.type, touch_out->type);
   EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
   CompareWebTouchEvents(touch, *touch_out);
 }
 
 }  // namespace content