Collapse the API surface on WebInputEvent via accessor functions.

content/common/input/event_with_latency_info_unittest.cc

 // Copyright 2015 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 "content/common/input/event_with_latency_info.h"
 
 #include <limits>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
@@ skipping 51 matching lines @@
 
 TEST_F(EventWithLatencyInfoTest, TimestampCoalescingForMouseEvent) {
   MouseEventWithLatencyInfo mouse_0 = CreateMouseEvent(
       WebInputEvent::MouseMove, 5.0);
   MouseEventWithLatencyInfo mouse_1 = CreateMouseEvent(
       WebInputEvent::MouseMove, 10.0);
 
   ASSERT_TRUE(mouse_0.CanCoalesceWith(mouse_1));
   mouse_0.CoalesceWith(mouse_1);
   // Coalescing WebMouseEvent preserves newer timestamp.
-  EXPECT_EQ(10.0, mouse_0.event.timeStampSeconds);
+  EXPECT_EQ(10.0, mouse_0.event.timeStampSeconds());
 }
 
 TEST_F(EventWithLatencyInfoTest, TimestampCoalescingForMouseWheelEvent) {
   MouseWheelEventWithLatencyInfo mouse_wheel_0 = CreateMouseWheelEvent(5.0);
   MouseWheelEventWithLatencyInfo mouse_wheel_1 = CreateMouseWheelEvent(10.0);
 
   ASSERT_TRUE(mouse_wheel_0.CanCoalesceWith(mouse_wheel_1));
   mouse_wheel_0.CoalesceWith(mouse_wheel_1);
   // Coalescing WebMouseWheelEvent preserves newer timestamp.
-  EXPECT_EQ(10.0, mouse_wheel_0.event.timeStampSeconds);
+  EXPECT_EQ(10.0, mouse_wheel_0.event.timeStampSeconds());
 }
 
 TEST_F(EventWithLatencyInfoTest, TimestampCoalescingForTouchEvent) {
   TouchEventWithLatencyInfo touch_0 = CreateTouchEvent(
       WebInputEvent::TouchMove, 5.0);
   TouchEventWithLatencyInfo touch_1 = CreateTouchEvent(
       WebInputEvent::TouchMove, 10.0);
 
   ASSERT_TRUE(touch_0.CanCoalesceWith(touch_1));
   touch_0.CoalesceWith(touch_1);
   // Coalescing WebTouchEvent preserves newer timestamp.
-  EXPECT_EQ(10.0, touch_0.event.timeStampSeconds);
+  EXPECT_EQ(10.0, touch_0.event.timeStampSeconds());
 }
 
 TEST_F(EventWithLatencyInfoTest, TimestampCoalescingForGestureEvent) {
   GestureEventWithLatencyInfo scroll_0 = CreateGestureEvent(
       WebInputEvent::GestureScrollUpdate, 5.0);
   GestureEventWithLatencyInfo scroll_1 = CreateGestureEvent(
       WebInputEvent::GestureScrollUpdate, 10.0);
 
   ASSERT_TRUE(scroll_0.CanCoalesceWith(scroll_1));
   scroll_0.CoalesceWith(scroll_1);
   // Coalescing WebGestureEvent preserves newer timestamp.
-  EXPECT_EQ(10.0, scroll_0.event.timeStampSeconds);
+  EXPECT_EQ(10.0, scroll_0.event.timeStampSeconds());
 }
 
 TEST_F(EventWithLatencyInfoTest, LatencyInfoCoalescing) {
     MouseEventWithLatencyInfo mouse_0 = CreateMouseEvent(
       WebInputEvent::MouseMove, 5.0);
   mouse_0.latency.AddLatencyNumberWithTimestamp(
       ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, 0, base::TimeTicks(), 1);
   MouseEventWithLatencyInfo mouse_1 = CreateMouseEvent(
       WebInputEvent::MouseMove, 10.0);
 
@@ skipping 193 matching lines @@
 
   // Coalesce old and new events.
   mouse_wheel_0 = CreateMouseWheel(1, 1);
   mouse_wheel_0.event.x = 1;
   mouse_wheel_0.event.y = 1;
   mouse_wheel_1 = CreateMouseWheel(2, 2);
   mouse_wheel_1.event.x = 2;
   mouse_wheel_1.event.y = 2;
   MouseWheelEventWithLatencyInfo mouse_wheel_1_copy = mouse_wheel_1;
   EXPECT_TRUE(CanCoalesce(mouse_wheel_0, mouse_wheel_1));
-  EXPECT_EQ(mouse_wheel_0.event.modifiers, mouse_wheel_1.event.modifiers);
+  EXPECT_EQ(mouse_wheel_0.event.modifiers(), mouse_wheel_1.event.modifiers());
   EXPECT_EQ(mouse_wheel_0.event.scrollByPage, mouse_wheel_1.event.scrollByPage);
   EXPECT_EQ(mouse_wheel_0.event.phase, mouse_wheel_1.event.phase);
   EXPECT_EQ(mouse_wheel_0.event.momentumPhase,
             mouse_wheel_1.event.momentumPhase);
   EXPECT_EQ(mouse_wheel_0.event.hasPreciseScrollingDeltas,
             mouse_wheel_1.event.hasPreciseScrollingDeltas);
   Coalesce(mouse_wheel_0, &mouse_wheel_1);
 
   // Coalesced event has the position of the most recent event.
   EXPECT_EQ(1, mouse_wheel_1.event.x);
@@ skipping 19 matching lines @@
 
 // Coalescing preserves the newer timestamp.
 TEST_F(EventWithLatencyInfoTest, TimestampCoalescing) {
   MouseWheelEventWithLatencyInfo mouse_wheel_0 =
       CreateMouseWheelEvent(5.0, 1, 1);
   MouseWheelEventWithLatencyInfo mouse_wheel_1 =
       CreateMouseWheelEvent(10.0, 2, 2);
 
   EXPECT_TRUE(CanCoalesce(mouse_wheel_0, mouse_wheel_1));
   Coalesce(mouse_wheel_1, &mouse_wheel_0);
-  EXPECT_EQ(10.0, mouse_wheel_0.event.timeStampSeconds);
+  EXPECT_EQ(10.0, mouse_wheel_0.event.timeStampSeconds());
 }
 
 }  // namespace
 }  // namespace content