| Index: ui/events/ipc/latency_info_param_traits_unittest.cc
|
| diff --git a/ui/events/ipc/latency_info_param_traits_unittest.cc b/ui/events/ipc/latency_info_param_traits_unittest.cc
|
| index 69224dace99ac529c4a265f8deff2fb7475a5b83..d96a986ca9bb07054c15fd624f107f50f70d780e 100644
|
| --- a/ui/events/ipc/latency_info_param_traits_unittest.cc
|
| +++ b/ui/events/ipc/latency_info_param_traits_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/events/ipc/latency_info_param_traits.h"
|
| #include "ui/events/ipc/latency_info_param_traits_macros.h"
|
| +#include "ui/gfx/ipc/geometry/gfx_param_traits.h"
|
|
|
| namespace ui {
|
|
|
| @@ -20,13 +21,10 @@ TEST(LatencyInfoParamTraitsTest, Basic) {
|
| latency.AddLatencyNumber(INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT, 1234, 100);
|
| latency.AddLatencyNumber(INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT,
|
| 1234, 0);
|
| - EXPECT_TRUE(latency.AddInputCoordinate(
|
| - LatencyInfo::InputCoordinate(100, 200)));
|
| - EXPECT_TRUE(latency.AddInputCoordinate(
|
| - LatencyInfo::InputCoordinate(101, 201)));
|
| + EXPECT_TRUE(latency.AddInputCoordinate(gfx::PointF(100, 200)));
|
| + EXPECT_TRUE(latency.AddInputCoordinate(gfx::PointF(101, 201)));
|
| // Up to 2 InputCoordinate is allowed.
|
| - EXPECT_FALSE(latency.AddInputCoordinate(
|
| - LatencyInfo::InputCoordinate(102, 202)));
|
| + EXPECT_FALSE(latency.AddInputCoordinate(gfx::PointF(102, 202)));
|
|
|
| EXPECT_EQ(100, latency.trace_id());
|
| EXPECT_TRUE(latency.terminated());
|
| @@ -42,10 +40,10 @@ TEST(LatencyInfoParamTraitsTest, Basic) {
|
| EXPECT_EQ(latency.terminated(), output.terminated());
|
| EXPECT_EQ(latency.input_coordinates_size(), output.input_coordinates_size());
|
| for (size_t i = 0; i < latency.input_coordinates_size(); i++) {
|
| - EXPECT_EQ(latency.input_coordinates()[i].x,
|
| - output.input_coordinates()[i].x);
|
| - EXPECT_EQ(latency.input_coordinates()[i].y,
|
| - output.input_coordinates()[i].y);
|
| + EXPECT_EQ(latency.input_coordinates()[i].x(),
|
| + output.input_coordinates()[i].x());
|
| + EXPECT_EQ(latency.input_coordinates()[i].y(),
|
| + output.input_coordinates()[i].y());
|
| }
|
|
|
| EXPECT_TRUE(output.FindLatency(INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
|
| @@ -70,7 +68,7 @@ TEST(LatencyInfoParamTraitsTest, InvalidData) {
|
| IPC::WriteParam(&msg, components);
|
| // input_coordinates_size is 2 but only one InputCoordinate is written.
|
| IPC::WriteParam(&msg, static_cast<uint32_t>(2));
|
| - IPC::WriteParam(&msg, ui::LatencyInfo::InputCoordinate());
|
| + IPC::WriteParam(&msg, gfx::PointF());
|
| IPC::WriteParam(&msg, static_cast<int64_t>(1234));
|
| IPC::WriteParam(&msg, true);
|
|
|
|
|