Split the event library into a cross-platform and native part. Part 1.

ui/events/x/events_x_unittest.cc

Index: ui/events/x/events_x_unittest.cc
diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc
index 2e3367449c4c6611c7a76f5d212483bc218b3b7b..0c4b36a1092a6636eff6c601ac26756dd5fe0cdb 100644
--- a/ui/events/x/events_x_unittest.cc
+++ b/ui/events/x/events_x_unittest.cc
@@ -19,6 +19,7 @@
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/platform/platform_event_builder.h"
 #include "ui/events/test/events_test_utils.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #include "ui/events/x/device_data_manager_x11.h"
@@ -72,7 +73,7 @@ bool HasFunctionKeyFlagSetIfSupported(Display* display, int x_keysym) {
   // Exclude keysyms for which the server has no corresponding keycode.
   if (x_keycode) {
     InitKeyEvent(display, &event, true, x_keycode, 0);
-    ui::KeyEvent ui_key_event(&event);
+    ui::KeyEvent ui_key_event = PlatformEventBuilder::BuildKeyEvent(&event);
     return (ui_key_event.flags() & ui::EF_FUNCTION_KEY);
   }
   return true;
@@ -201,14 +202,14 @@ TEST_F(EventsXTest, ClickCount) {
   for (int i = 1; i <= 3; ++i) {
     InitButtonEvent(&event, true, location, 1, 0);
     {
-      MouseEvent mouseev(&event);
+      MouseEvent mouseev = PlatformEventBuilder::BuildMouseEvent(&event);
       EXPECT_EQ(ui::ET_MOUSE_PRESSED, mouseev.type());
       EXPECT_EQ(i, mouseev.GetClickCount());
     }
 
     InitButtonEvent(&event, false, location, 1, 0);
     {
-      MouseEvent mouseev(&event);
+      MouseEvent mouseev = PlatformEventBuilder::BuildMouseEvent(&event);
       EXPECT_EQ(ui::ET_MOUSE_RELEASED, mouseev.type());
       EXPECT_EQ(i, mouseev.GetClickCount());
     }
@@ -456,7 +457,7 @@ TEST_F(EventsXTest, NumpadKeyEvents) {
       InitKeyEvent(display, &event, true, x_keycode, 0);
       // int keysym = XLookupKeysym(&event.xkey, 0);
       // if (keysym) {
-      ui::KeyEvent ui_key_event(&event);
+      ui::KeyEvent ui_key_event = PlatformEventBuilder::BuildKeyEvent(&event);
       EXPECT_EQ(keys[k].is_numpad_key ? ui::EF_NUMPAD_KEY : 0,
                 ui_key_event.flags() & ui::EF_NUMPAD_KEY);
     }
@@ -611,7 +612,7 @@ TEST_F(EventsXTest, ImeFabricatedKeyEvents) {
     for (int is_char = 0; is_char < 2; ++is_char) {
       XEvent x_event;
       InitKeyEvent(display, &x_event, true, 0, state);
-      ui::KeyEvent key_event(&x_event);
+      ui::KeyEvent key_event = PlatformEventBuilder::BuildKeyEvent(&x_event);
       if (is_char) {
         KeyEventTestApi test_event(&key_event);
         test_event.set_is_char(true);
@@ -628,7 +629,7 @@ TEST_F(EventsXTest, ImeFabricatedKeyEvents) {
     for (int is_char = 0; is_char < 2; ++is_char) {
       XEvent x_event;
       InitKeyEvent(display, &x_event, true, 0, state);
-      ui::KeyEvent key_event(&x_event);
+      ui::KeyEvent key_event = PlatformEventBuilder::BuildKeyEvent(&x_event);
       if (is_char) {
         KeyEventTestApi test_event(&key_event);
         test_event.set_is_char(true);