Collapse the API surface on WebInputEvent via accessor functions.

content/browser/renderer_host/input/web_input_event_builders_mac_unittest.mm

 // 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/browser/renderer_host/input/web_input_event_builders_mac.h"
 
 #include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
@@ skipping 56 matching lines @@
 }
 
 }  // namespace
 
 // Test that arrow keys don't have numpad modifier set.
 TEST(WebInputEventBuilderMacTest, ArrowKeyNumPad) {
   // Left
   NSEvent* mac_event = BuildFakeKeyEvent(0x7B, NSLeftArrowFunctionKey,
                                          NSNumericPadKeyMask, NSKeyDown);
   WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
-  EXPECT_EQ(0, web_event.modifiers);
+  EXPECT_EQ(0, web_event.modifiers());
   EXPECT_EQ(ui::DomCode::ARROW_LEFT,
             static_cast<ui::DomCode>(web_event.domCode));
   EXPECT_EQ(ui::DomKey::ARROW_LEFT, web_event.domKey);
 
   // Right
   mac_event = BuildFakeKeyEvent(0x7C, NSRightArrowFunctionKey,
                                 NSNumericPadKeyMask, NSKeyDown);
   web_event = WebKeyboardEventBuilder::Build(mac_event);
-  EXPECT_EQ(0, web_event.modifiers);
+  EXPECT_EQ(0, web_event.modifiers());
   EXPECT_EQ(ui::DomCode::ARROW_RIGHT,
             static_cast<ui::DomCode>(web_event.domCode));
   EXPECT_EQ(ui::DomKey::ARROW_RIGHT, web_event.domKey);
 
   // Down
   mac_event = BuildFakeKeyEvent(0x7D, NSDownArrowFunctionKey,
                                 NSNumericPadKeyMask, NSKeyDown);
   web_event = WebKeyboardEventBuilder::Build(mac_event);
-  EXPECT_EQ(0, web_event.modifiers);
+  EXPECT_EQ(0, web_event.modifiers());
   EXPECT_EQ(ui::DomCode::ARROW_DOWN,
             static_cast<ui::DomCode>(web_event.domCode));
   EXPECT_EQ(ui::DomKey::ARROW_DOWN, web_event.domKey);
 
   // Up
   mac_event = BuildFakeKeyEvent(0x7E, NSUpArrowFunctionKey, NSNumericPadKeyMask,
                                 NSKeyDown);
   web_event = WebKeyboardEventBuilder::Build(mac_event);
-  EXPECT_EQ(0, web_event.modifiers);
+  EXPECT_EQ(0, web_event.modifiers());
   EXPECT_EQ(ui::DomCode::ARROW_UP, static_cast<ui::DomCode>(web_event.domCode));
   EXPECT_EQ(ui::DomKey::ARROW_UP, web_event.domKey);
 }
 
 // Test that control sequence generate the correct vkey code.
 TEST(WebInputEventBuilderMacTest, ControlSequence) {
   // Ctrl-[ generates escape.
   NSEvent* mac_event =
       BuildFakeKeyEvent(0x21, 0x1b, NSControlKeyMask, NSKeyDown);
   WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
@@ skipping 58 matching lines @@
 // pressed simultaneously.
 TEST(WebInputEventFactoryTestMac, SimultaneousModifierKeys) {
   for (size_t i = 0; i < arraysize(kModifierKeys) / 2; ++i) {
     const ModifierKey& left = kModifierKeys[2 * i];
     const ModifierKey& right = kModifierKeys[2 * i + 1];
     // Press the left key.
     NSEvent* mac_event = BuildFakeKeyEvent(
         left.mac_key_code, 0, left.left_or_right_mask | left.non_specific_mask,
         NSFlagsChanged);
     WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
-    EXPECT_EQ(WebInputEvent::RawKeyDown, web_event.type);
+    EXPECT_EQ(WebInputEvent::RawKeyDown, web_event.type());
     // Press the right key
     mac_event =
         BuildFakeKeyEvent(right.mac_key_code, 0,
                           left.left_or_right_mask | right.left_or_right_mask |
                               left.non_specific_mask,
                           NSFlagsChanged);
     web_event = WebKeyboardEventBuilder::Build(mac_event);
-    EXPECT_EQ(WebInputEvent::RawKeyDown, web_event.type);
+    EXPECT_EQ(WebInputEvent::RawKeyDown, web_event.type());
     // Release the right key
     mac_event = BuildFakeKeyEvent(
         right.mac_key_code, 0, left.left_or_right_mask | left.non_specific_mask,
         NSFlagsChanged);
     // Release the left key
     mac_event = BuildFakeKeyEvent(left.mac_key_code, 0, 0, NSFlagsChanged);
     web_event = WebKeyboardEventBuilder::Build(mac_event);
-    EXPECT_EQ(WebInputEvent::KeyUp, web_event.type);
+    EXPECT_EQ(WebInputEvent::KeyUp, web_event.type());
   }
 }
 
 // Test that individual modifier keys are still reported correctly, even if the
 // undocumented left- or right-hand flags are not set.
 TEST(WebInputEventBuilderMacTest, MissingUndocumentedModifierFlags) {
   for (size_t i = 0; i < arraysize(kModifierKeys); ++i) {
     const ModifierKey& key = kModifierKeys[i];
     NSEvent* mac_event = BuildFakeKeyEvent(
         key.mac_key_code, 0, key.non_specific_mask, NSFlagsChanged);
     WebKeyboardEvent web_event = WebKeyboardEventBuilder::Build(mac_event);
-    EXPECT_EQ(WebInputEvent::RawKeyDown, web_event.type);
+    EXPECT_EQ(WebInputEvent::RawKeyDown, web_event.type());
     mac_event = BuildFakeKeyEvent(key.mac_key_code, 0, 0, NSFlagsChanged);
     web_event = WebKeyboardEventBuilder::Build(mac_event);
-    EXPECT_EQ(WebInputEvent::KeyUp, web_event.type);
+    EXPECT_EQ(WebInputEvent::KeyUp, web_event.type());
   }
 }
 
 // Test system key events recognition.
 TEST(WebInputEventBuilderMacTest, SystemKeyEvents) {
   // Cmd + B should not be treated as system event.
   NSEvent* macEvent =
       BuildFakeKeyEvent(kVK_ANSI_B, 'B', NSCommandKeyMask, NSKeyDown);
   WebKeyboardEvent webEvent = WebKeyboardEventBuilder::Build(macEvent);
   EXPECT_FALSE(webEvent.isSystemKey);
@@ skipping 385 matching lines @@
   EXPECT_EQ(web_event.deltaY, ui_event.y_offset());
 
   EXPECT_EQ(11, web_event.x);
   EXPECT_EQ(web_event.x, ui_event.x());
 
   // Both ui:: and blink:: events use an origin at the top-left.
   EXPECT_EQ(100 - 22, web_event.y);
   EXPECT_EQ(web_event.y, ui_event.y());
   [window close];
 }