Index: content/renderer/pepper/event_conversion_unittest.cc |
diff --git a/content/renderer/pepper/event_conversion_unittest.cc b/content/renderer/pepper/event_conversion_unittest.cc |
index 8a22a939e8da459ab08932d8fdaa8fd40cef6f75..8f2cb74347ef2ecdc8e1631939377b869c5a5e29 100644 |
--- a/content/renderer/pepper/event_conversion_unittest.cc |
+++ b/content/renderer/pepper/event_conversion_unittest.cc |
@@ -20,19 +20,19 @@ class EventConversionTest : public ::testing::Test { |
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); |
} |
} |
}; |