Collapse the API surface on WebInputEvent via accessor functions.

ui/events/blink/input_handler_proxy_unittest.cc

 // Copyright 2013 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 "ui/events/blink/input_handler_proxy.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 57 matching lines @@
 };
 static const InputHandlerProxyTestType test_types[] = {
     ROOT_SCROLL_NORMAL_HANDLER, ROOT_SCROLL_SYNCHRONOUS_HANDLER,
     CHILD_SCROLL_NORMAL_HANDLER, CHILD_SCROLL_SYNCHRONOUS_HANDLER};
 
 double InSecondsF(const base::TimeTicks& time) {
   return (time - base::TimeTicks()).InSecondsF();
 }
 
 bool WheelEventsMatch(const WebInputEvent& lhs, const WebInputEvent& rhs) {
-  if (lhs.size == rhs.size && lhs.type == rhs.type &&
-      lhs.type == WebInputEvent::MouseWheel) {
+  if (lhs.size() == rhs.size() && lhs.type() == rhs.type() &&
+      lhs.type() == WebInputEvent::MouseWheel) {
     WebMouseWheelEvent rhs_timestamped =
         static_cast<const WebMouseWheelEvent&>(rhs);
-    rhs_timestamped.timeStampSeconds = lhs.timeStampSeconds;
-    return memcmp(&rhs_timestamped, &lhs, rhs.size) == 0;
+    rhs_timestamped.setTimeStampSeconds(lhs.timeStampSeconds());
+    return memcmp(&rhs_timestamped, &lhs, rhs.size()) == 0;
   }
   return false;
 }
 
 MATCHER_P(WheelEventsMatch, expected, "") {
   return WheelEventsMatch(arg, expected);
 }
 
 WebGestureEvent CreateFling(base::TimeTicks timestamp,
                             WebGestureDevice source_device,
@@ skipping 3108 matching lines @@
   HandleGestureEvent(WebInputEvent::GesturePinchUpdate, 10.0f, 1, 10);
   HandleGestureEvent(WebInputEvent::GestureScrollUpdate, -30);
   HandleGestureEvent(WebInputEvent::GesturePinchUpdate, 0.25f, 3, 30);
   HandleGestureEvent(WebInputEvent::GestureScrollUpdate, -10);
   HandleGestureEvent(WebInputEvent::GesturePinchEnd);
 
   // Only the first GSB was dispatched.
   EXPECT_EQ(7ul, event_queue().size());
   EXPECT_EQ(1ul, event_disposition_recorder_.size());
 
-  EXPECT_EQ(WebInputEvent::GestureScrollUpdate, event_queue()[0]->event().type);
+  EXPECT_EQ(WebInputEvent::GestureScrollUpdate,
+            event_queue()[0]->event().type());
   EXPECT_EQ(
       -35,
       ToWebGestureEvent(event_queue()[0]->event()).data.scrollUpdate.deltaY);
-  EXPECT_EQ(WebInputEvent::GesturePinchUpdate, event_queue()[1]->event().type);
+  EXPECT_EQ(WebInputEvent::GesturePinchUpdate,
+            event_queue()[1]->event().type());
   EXPECT_EQ(
       2.0f,
       ToWebGestureEvent(event_queue()[1]->event()).data.pinchUpdate.scale);
-  EXPECT_EQ(WebInputEvent::GestureScrollEnd, event_queue()[2]->event().type);
-  EXPECT_EQ(WebInputEvent::GesturePinchBegin, event_queue()[3]->event().type);
-  EXPECT_EQ(WebInputEvent::GestureScrollUpdate, event_queue()[4]->event().type);
+  EXPECT_EQ(WebInputEvent::GestureScrollEnd, event_queue()[2]->event().type());
+  EXPECT_EQ(WebInputEvent::GesturePinchBegin, event_queue()[3]->event().type());
+  EXPECT_EQ(WebInputEvent::GestureScrollUpdate,
+            event_queue()[4]->event().type());
   EXPECT_EQ(
       -85,
       ToWebGestureEvent(event_queue()[4]->event()).data.scrollUpdate.deltaY);
-  EXPECT_EQ(WebInputEvent::GesturePinchUpdate, event_queue()[5]->event().type);
+  EXPECT_EQ(WebInputEvent::GesturePinchUpdate,
+            event_queue()[5]->event().type());
   EXPECT_EQ(
       0.5f,
       ToWebGestureEvent(event_queue()[5]->event()).data.pinchUpdate.scale);
-  EXPECT_EQ(WebInputEvent::GesturePinchEnd, event_queue()[6]->event().type);
+  EXPECT_EQ(WebInputEvent::GesturePinchEnd, event_queue()[6]->event().type());
   testing::Mock::VerifyAndClearExpectations(&mock_input_handler_);
 }
 
 INSTANTIATE_TEST_CASE_P(AnimateInput,
                         InputHandlerProxyTest,
                         testing::ValuesIn(test_types));
 
 }  // namespace test
 }  // namespace ui