Wire input events through the ViewManagerClient interface.

mojo/services/native_viewport/native_viewport_service.cc

Index: mojo/services/native_viewport/native_viewport_service.cc
diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc
index f90cef363f7e2bbbc4ef757104526a9fb8030db4..eb8408147454452de2b58d66e0c59d249c833562 100644
--- a/mojo/services/native_viewport/native_viewport_service.cc
+++ b/mojo/services/native_viewport/native_viewport_service.cc
@@ -13,6 +13,7 @@
 #include "mojo/services/native_viewport/native_viewport.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
+#include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "ui/events/event.h"
 
 namespace mojo {
@@ -119,37 +120,9 @@ class NativeViewportImpl
       return false;
 
     AllocationScope scope;
-
-    Event::Builder event;
-    event.set_action(ui_event->type());
-    event.set_flags(ui_event->flags());
-    event.set_time_stamp(ui_event->time_stamp().ToInternalValue());
-
-    if (ui_event->IsMouseEvent() || ui_event->IsTouchEvent()) {
-      ui::LocatedEvent* located_event =
-          static_cast<ui::LocatedEvent*>(ui_event);
-      Point::Builder location;
-      location.set_x(located_event->location().x());
-      location.set_y(located_event->location().y());
-      event.set_location(location.Finish());
-    }
-
-    if (ui_event->IsTouchEvent()) {
-      ui::TouchEvent* touch_event = static_cast<ui::TouchEvent*>(ui_event);
-      TouchData::Builder touch_data;
-      touch_data.set_pointer_id(touch_event->touch_id());
-      event.set_touch_data(touch_data.Finish());
-    } else if (ui_event->IsKeyEvent()) {
-      ui::KeyEvent* key_event = static_cast<ui::KeyEvent*>(ui_event);
-      KeyData::Builder key_data;
-      key_data.set_key_code(key_event->key_code());
-      key_data.set_is_char(key_event->is_char());
-      event.set_key_data(key_data.Finish());
-    }
-
-    client()->OnEvent(event.Finish(),
-                     base::Bind(&NativeViewportImpl::AckEvent,
-                                base::Unretained(this)));
+    client()->OnEvent(*ui_event,
+                      base::Bind(&NativeViewportImpl::AckEvent,
+                                 base::Unretained(this)));
     waiting_for_event_ack_ = true;
     return false;
   }