Collapse the API surface on WebInputEvent via accessor functions.

content/browser/renderer_host/render_widget_host_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
 
@@ skipping 59 matching lines @@
 std::string GetInputMessageTypes(MockRenderProcessHost* process) {
   std::string result;
   for (size_t i = 0; i < process->sink().message_count(); ++i) {
     const IPC::Message* message = process->sink().GetMessageAt(i);
     EXPECT_EQ(InputMsg_HandleInputEvent::ID, message->type());
     InputMsg_HandleInputEvent::Param params;
     EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, &params));
     const WebInputEvent* event = std::get<0>(params);
     if (i != 0)
       result += " ";
-    result += WebInputEvent::GetName(event->type);
+    result += WebInputEvent::GetName(event->type());
   }
   process->sink().ClearMessages();
   return result;
 }
 
 // MockInputRouter -------------------------------------------------------------
 
 class MockInputRouter : public InputRouter {
  public:
   explicit MockInputRouter(InputRouterClient* client)
@@ skipping 85 matching lines @@
   using RenderWidgetHostImpl::RendererExited;
   using RenderWidgetHostImpl::SetInitialRenderSizeParams;
   using RenderWidgetHostImpl::old_resize_params_;
   using RenderWidgetHostImpl::is_hidden_;
   using RenderWidgetHostImpl::resize_ack_pending_;
   using RenderWidgetHostImpl::input_router_;
 
   void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
                        InputEventAckState ack_result) override {
     // Sniff touch acks.
-    acked_touch_event_type_ = event.event.type;
+    acked_touch_event_type_ = event.event.type();
     RenderWidgetHostImpl::OnTouchEventAck(event, ack_result);
   }
 
   bool new_content_rendering_timeout_fired() const {
     return new_content_rendering_timeout_fired_;
   }
 
   void DisableGestureDebounce() {
     input_router_.reset(new InputRouterImpl(
         process_, this, this, routing_id_, InputRouterImpl::Config()));
@@ skipping 93 matching lines @@
   }
   void WheelEventAck(const WebMouseWheelEvent& event,
                      InputEventAckState ack_result) override {
     if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
       return;
     unhandled_wheel_event_count_++;
     unhandled_wheel_event_ = event;
   }
   void GestureEventAck(const WebGestureEvent& event,
                        InputEventAckState ack_result) override {
-    gesture_event_type_ = event.type;
+    gesture_event_type_ = event.type();
     ack_result_ = ack_result;
   }
   gfx::Size GetPhysicalBackingSize() const override {
     if (use_fake_physical_backing_size_)
       return mock_physical_backing_size_;
     return TestRenderWidgetHostView::GetPhysicalBackingSize();
   }
 #if defined(USE_AURA)
   ~TestView() override {
     // Simulate the mouse exit event dispatched when an aura window is
@@ skipping 78 matching lines @@
   }
 
   // RenderWidgetHostDelegate overrides.
   void GetScreenInfo(ScreenInfo* screen_info) override {
     *screen_info = screen_info_;
   }
 
  protected:
   bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                               bool* is_keyboard_shortcut) override {
-    prehandle_keyboard_event_type_ = event.type;
+    prehandle_keyboard_event_type_ = event.type();
     prehandle_keyboard_event_called_ = true;
     *is_keyboard_shortcut = prehandle_keyboard_event_is_shortcut_;
     return prehandle_keyboard_event_;
   }
 
   void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override {
-    unhandled_keyboard_event_type_ = event.type;
+    unhandled_keyboard_event_type_ = event.type();
     unhandled_keyboard_event_called_ = true;
   }
 
   bool HandleWheelEvent(const blink::WebMouseWheelEvent& event) override {
     handle_wheel_event_called_ = true;
     return handle_wheel_event_;
   }
 
   void RendererUnresponsive(RenderWidgetHostImpl* render_widget_host,
                             RendererUnresponsiveType type) override {
@@ skipping 1152 matching lines @@
   EXPECT_EQ(process->sink().message_count(), 1U);
 
   const IPC::Message* message = process->sink().GetMessageAt(0);
   EXPECT_EQ(InputMsg_HandleInputEvent::ID, message->type());
   InputMsg_HandleInputEvent::Param params;
   EXPECT_TRUE(InputMsg_HandleInputEvent::Read(message, &params));
 
   const WebInputEvent* event = std::get<0>(params);
   ui::LatencyInfo latency_info = std::get<1>(params);
 
-  EXPECT_TRUE(event->type == expected_type);
+  EXPECT_TRUE(event->type() == expected_type);
   EXPECT_TRUE(latency_info.FindLatency(
       ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT, component_id, NULL));
 
   process->sink().ClearMessages();
 }
 
 // Tests that after input event passes through RWHI through ForwardXXXEvent()
 // or ForwardXXXEventWithLatencyInfo(), LatencyInfo component
 // ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT will always present in the
 // event's LatencyInfo.
@@ skipping 124 matching lines @@
                                       ui::LatencyInfo());
 
 
   // Tests RWHI::ForwardWheelEventWithLatencyInfo().
   SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
 
   ASSERT_FALSE(host_->input_router()->HasPendingEvents());
 }
 
 }  // namespace content