Replace ui::LatencyInfo::InputCoordinate with gfx::PointF

ui/events/mojo/struct_traits_unittest.cc

 // Copyright 2016 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/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/mojo/traits_test_service.mojom.h"
 
 namespace ui {
 
 namespace {
 
 class StructTraitsTest : public testing::Test, public mojom::TraitsTestService {
  public:
   StructTraitsTest() {}
 
  protected:
   mojom::TraitsTestServicePtr GetTraitsTestProxy() {
     return traits_test_bindings_.CreateInterfacePtrAndBind(this);
   }
 
  private:
   // TraitsTestService:
-  void EchoInputCoordinate(
-      const LatencyInfo::InputCoordinate& i,
-      const EchoInputCoordinateCallback& callback) override {
-    callback.Run(i);
-  }
-
   void EchoLatencyComponent(
       const LatencyInfo::LatencyComponent& l,
       const EchoLatencyComponentCallback& callback) override {
     callback.Run(l);
   }
 
   void EchoLatencyComponentId(
       const std::pair<LatencyComponentType, int64_t>& id,
       const EchoLatencyComponentIdCallback& callback) override {
     callback.Run(id);
   }
 
   void EchoLatencyInfo(const LatencyInfo& info,
                        const EchoLatencyInfoCallback& callback) override {
     callback.Run(info);
   }
 
   base::MessageLoop loop_;
   mojo::BindingSet<TraitsTestService> traits_test_bindings_;
   DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
 };
 
 }  // namespace
 
-TEST_F(StructTraitsTest, InputCoordinate) {
-  const float x = 1337.5f;
-  const float y = 7331.6f;
-  LatencyInfo::InputCoordinate input(x, y);
-  mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
-  LatencyInfo::InputCoordinate output;
-  proxy->EchoInputCoordinate(input, &output);
-  EXPECT_EQ(x, output.x);
-  EXPECT_EQ(y, output.y);
-}
-
 TEST_F(StructTraitsTest, LatencyComponent) {
   const int64_t sequence_number = 13371337;
   const base::TimeTicks event_time = base::TimeTicks::Now();
   const uint32_t event_count = 1234;
   LatencyInfo::LatencyComponent input;
   input.sequence_number = sequence_number;
   input.event_time = event_time;
   input.event_count = event_count;
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   LatencyInfo::LatencyComponent output;
@@ skipping 16 matching lines @@
 }
 
 TEST_F(StructTraitsTest, LatencyInfo) {
   LatencyInfo latency;
   ASSERT_FALSE(latency.terminated());
   ASSERT_EQ(0u, latency.input_coordinates_size());
   latency.AddLatencyNumber(INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 1234, 0);
   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());
   EXPECT_EQ(2u, latency.input_coordinates_size());
 
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   LatencyInfo output;
   proxy->EchoLatencyInfo(latency, &output);
 
   EXPECT_EQ(latency.trace_id(), output.trace_id());
   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, 1234,
                                  nullptr));
 
   LatencyInfo::LatencyComponent rwh_comp;
   EXPECT_TRUE(output.FindLatency(INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT, 1234,
                                  &rwh_comp));
   EXPECT_EQ(100, rwh_comp.sequence_number);
   EXPECT_EQ(1u, rwh_comp.event_count);
 
   EXPECT_TRUE(output.FindLatency(
       INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 1234, nullptr));
 }
 
 }  // namespace ui