Merge the mojo blink type converter into ui/events/blink

ui/events/blink/web_input_event_unittest.cc

Index: ui/events/blink/web_input_event_unittest.cc
diff --git a/ui/events/blink/web_input_event_unittest.cc b/ui/events/blink/web_input_event_unittest.cc
index 2576594d00e4f2831879f009a34cb21c1fb8ad7e..c8936c0a305646538e144467165e931fc7c5e1de 100644
--- a/ui/events/blink/web_input_event_unittest.cc
+++ b/ui/events/blink/web_input_event_unittest.cc
@@ -487,8 +487,10 @@ TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) {
                     webkit_event.timeStampSeconds);
     EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
-    EXPECT_FLOAT_EQ(ui_event.x_offset() / 53.0f, webkit_event.wheelTicksX);
-    EXPECT_FLOAT_EQ(ui_event.y_offset() / 53.0f, webkit_event.wheelTicksY);
+    EXPECT_FLOAT_EQ(ui_event.x_offset() / MouseWheelEvent::kWheelDelta,
+                    webkit_event.wheelTicksX);
+    EXPECT_FLOAT_EQ(ui_event.y_offset() / MouseWheelEvent::kWheelDelta,
+                    webkit_event.wheelTicksY);
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
     EXPECT_EQ(0, webkit_event.tiltX);
@@ -514,7 +516,8 @@ TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) {
                     webkit_event.timeStampSeconds);
     EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type);
-    EXPECT_FLOAT_EQ(ui_event.y_offset() / 53.0f, webkit_event.wheelTicksX);
+    EXPECT_FLOAT_EQ(ui_event.y_offset() / MouseWheelEvent::kWheelDelta,
+                    webkit_event.wheelTicksX);
     EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY);
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
@@ -528,4 +531,80 @@ TEST(WebInputEventTest, TestMakeWebMouseWheelEvent) {
   }
 }
 
+TEST(WebInputEventTest, KeyEvent) {
+  struct {
+    ui::KeyEvent event;
+    blink::WebInputEvent::Type web_type;
+    int web_modifiers;
+  } tests[] = {
+      {ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE),
+       blink::WebInputEvent::RawKeyDown, 0x0},
+      {ui::KeyEvent(L'B', ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN),
+       blink::WebInputEvent::Char,
+       blink::WebInputEvent::ShiftKey | blink::WebInputEvent::ControlKey},
+      {ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_C, ui::EF_ALT_DOWN),
+       blink::WebInputEvent::KeyUp, blink::WebInputEvent::AltKey}};
+
+  for (size_t i = 0; i < arraysize(tests); i++) {
+    blink::WebKeyboardEvent web_event = MakeWebKeyboardEvent(tests[i].event);
+    ASSERT_TRUE(blink::WebInputEvent::isKeyboardEventType(web_event.type));
+    ASSERT_EQ(tests[i].web_type, web_event.type);
+    ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers);
+    ASSERT_EQ(static_cast<int>(tests[i].event.GetLocatedWindowsKeyboardCode()),
+              web_event.windowsKeyCode);
+  }
+}
+
+TEST(WebInputEventTest, WheelEvent) {
+  const int kDeltaX = 14;
+  const int kDeltaY = -3;
+  ui::MouseWheelEvent ui_event(
+      ui::MouseEvent(ui::ET_UNKNOWN, gfx::Point(), gfx::Point(),
+                     base::TimeTicks(), 0, 0),
+      kDeltaX, kDeltaY);
+  blink::WebMouseWheelEvent web_event =
+      MakeWebMouseWheelEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
+  ASSERT_EQ(blink::WebInputEvent::MouseWheel, web_event.type);
+  ASSERT_EQ(0, web_event.modifiers);
+  ASSERT_EQ(kDeltaX, web_event.deltaX);
+  ASSERT_EQ(kDeltaY, web_event.deltaY);
+}
+
+TEST(WebInputEventTest, MousePointerEvent) {
+  struct {
+    ui::EventType ui_type;
+    blink::WebInputEvent::Type web_type;
+    int ui_modifiers;
+    int web_modifiers;
+    gfx::Point location;
+    gfx::Point screen_location;
+  } tests[] = {
+      {ui::ET_MOUSE_PRESSED, blink::WebInputEvent::MouseDown, 0x0, 0x0,
+       gfx::Point(3, 5), gfx::Point(113, 125)},
+      {ui::ET_MOUSE_RELEASED, blink::WebInputEvent::MouseUp,
+       ui::EF_LEFT_MOUSE_BUTTON, blink::WebInputEvent::LeftButtonDown,
+       gfx::Point(100, 1), gfx::Point(50, 1)},
+      {ui::ET_MOUSE_MOVED, blink::WebInputEvent::MouseMove,
+       ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON,
+       blink::WebInputEvent::MiddleButtonDown |
+           blink::WebInputEvent::RightButtonDown,
+       gfx::Point(13, 3), gfx::Point(53, 3)},
+  };
+
+  for (size_t i = 0; i < arraysize(tests); i++) {
+    ui::MouseEvent ui_event(tests[i].ui_type, tests[i].location,
+                            tests[i].screen_location, base::TimeTicks(),
+                            tests[i].ui_modifiers, 0);
+    blink::WebMouseEvent web_event =
+        MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
+    ASSERT_TRUE(blink::WebInputEvent::isMouseEventType(web_event.type));
+    ASSERT_EQ(tests[i].web_type, web_event.type);
+    ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers);
+    ASSERT_EQ(tests[i].location.x(), web_event.x);
+    ASSERT_EQ(tests[i].location.y(), web_event.y);
+    ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX);
+    ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY);
+  }
+}
+
 }  // namespace ui