Add constructors to WebInputEvents and setters so we can work at cleaning up these public structs.

content/public/test/render_view_test.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 "content/public/test/render_view_test.h"
 
 #include <stddef.h>
 
 #include <cctype>
 
@@ skipping 33 matching lines @@
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "v8/include/v8.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 #if defined(OS_WIN)
 #include "content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.h"
 #include "content/test/dwrite_font_fake_sender_win.h"
@@ skipping 378 matching lines @@
 
 bool RenderViewTest::SimulateElementClick(const std::string& element_id) {
   gfx::Rect bounds = GetElementBounds(element_id);
   if (bounds.IsEmpty())
     return false;
   SimulatePointClick(bounds.CenterPoint());
   return true;
 }
 
 void RenderViewTest::SimulatePointClick(const gfx::Point& point) {
-  WebMouseEvent mouse_event;
-  mouse_event.type = WebInputEvent::MouseDown;
+  WebMouseEvent mouse_event(WebInputEvent::MouseDown,
+                            WebInputEvent::NoModifiers,
+                            ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
   mouse_event.button = WebMouseEvent::Button::Left;
   mouse_event.x = point.x();
   mouse_event.y = point.y();
   mouse_event.clickCount = 1;
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->OnMessageReceived(InputMsg_HandleInputEvent(
       0, &mouse_event, ui::LatencyInfo(),
       InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
-  mouse_event.type = WebInputEvent::MouseUp;
+  mouse_event.setType(WebInputEvent::MouseUp);
   impl->OnMessageReceived(InputMsg_HandleInputEvent(
       0, &mouse_event, ui::LatencyInfo(),
       InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
 }
 
 
 bool RenderViewTest::SimulateElementRightClick(const std::string& element_id) {
   gfx::Rect bounds = GetElementBounds(element_id);
   if (bounds.IsEmpty())
     return false;
   SimulatePointRightClick(bounds.CenterPoint());
   return true;
 }
 
 void RenderViewTest::SimulatePointRightClick(const gfx::Point& point) {
-  WebMouseEvent mouse_event;
-  mouse_event.type = WebInputEvent::MouseDown;
+  WebMouseEvent mouse_event(WebInputEvent::MouseDown,
+                            WebInputEvent::NoModifiers,
+                            ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
   mouse_event.button = WebMouseEvent::Button::Right;
   mouse_event.x = point.x();
   mouse_event.y = point.y();
   mouse_event.clickCount = 1;
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->OnMessageReceived(InputMsg_HandleInputEvent(
       0, &mouse_event, ui::LatencyInfo(),
       InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
-  mouse_event.type = WebInputEvent::MouseUp;
+  mouse_event.setType(WebInputEvent::MouseUp);
   impl->OnMessageReceived(InputMsg_HandleInputEvent(
       0, &mouse_event, ui::LatencyInfo(),
       InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
 }
 
 void RenderViewTest::SimulateRectTap(const gfx::Rect& rect) {
-  WebGestureEvent gesture_event;
+  WebGestureEvent gesture_event(
+      WebInputEvent::GestureTap, WebInputEvent::NoModifiers,
+      ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
   gesture_event.x = rect.CenterPoint().x();
   gesture_event.y = rect.CenterPoint().y();
   gesture_event.data.tap.tapCount = 1;
   gesture_event.data.tap.width = rect.width();
   gesture_event.data.tap.height = rect.height();
-  gesture_event.type = WebInputEvent::GestureTap;
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->OnMessageReceived(InputMsg_HandleInputEvent(
       0, &gesture_event, ui::LatencyInfo(),
       InputEventDispatchType::DISPATCH_TYPE_BLOCKING));
   impl->FocusChangeComplete();
 }
 
 void RenderViewTest::SetFocused(const blink::WebNode& node) {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
@@ skipping 28 matching lines @@
   params.top_controls_height = 0.f;
   params.browser_controls_shrink_blink_size = false;
   params.is_fullscreen_granted = is_fullscreen_granted;
   params.display_mode = blink::WebDisplayModeBrowser;
   std::unique_ptr<IPC::Message> resize_message(new ViewMsg_Resize(0, params));
   OnMessageReceived(*resize_message);
 }
 
 void RenderViewTest::SimulateUserTypingASCIICharacter(char ascii_character,
                                                       bool flush_message_loop) {
-  blink::WebKeyboardEvent event;
+  int modifiers = blink::WebInputEvent::NoModifiers;
+  if (isupper(ascii_character) || ascii_character == '@' ||
+      ascii_character == '_') {
+    modifiers = blink::WebKeyboardEvent::ShiftKey;
+  }
+
+  blink::WebKeyboardEvent event(
+      blink::WebKeyboardEvent::RawKeyDown, modifiers,
+      ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
   event.text[0] = ascii_character;
   ASSERT_TRUE(GetWindowsKeyCode(ascii_character, &event.windowsKeyCode));
-  if (isupper(ascii_character) || ascii_character == '@' ||
-      ascii_character == '_') {
-    event.modifiers = blink::WebKeyboardEvent::ShiftKey;
-  }
-
-  event.type = blink::WebKeyboardEvent::RawKeyDown;
   SendWebKeyboardEvent(event);
 
-  event.type = blink::WebKeyboardEvent::Char;
+  event.setType(blink::WebKeyboardEvent::Char);
   SendWebKeyboardEvent(event);
 
-  event.type = blink::WebKeyboardEvent::KeyUp;
+  event.setType(blink::WebKeyboardEvent::KeyUp);
   SendWebKeyboardEvent(event);
 
   if (flush_message_loop) {
     // Processing is delayed because of a Blink bug:
     // https://bugs.webkit.org/show_bug.cgi?id=16976 See
     // PasswordAutofillAgent::TextDidChangeInTextField() for details.
     base::RunLoop().RunUntilIdle();
   }
 }
 
@@ skipping 89 matching lines @@
       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
   frame->Navigate(common_params, StartNavigationParams(), request_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(frame).Wait();
   view_->GetWebView()->updateAllLifecyclePhases();
 }
 
 }  // namespace content