MacViews: Fix missing NSMouseMove in ui::EventTypeFromNative, add test coverage.

Missed a switch case in r266743 (doh). This CL fixes that and adds a bit
more test coverage. Testing at this layer hits a limit due to Cocoa API
limitations. MacViews will be getting a WidgetEventGenerator in
crrev/322893005.

BUG=366021, 378134
TEST=events_unittests

Review URL: https://codereview.chromium.org/346463003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278431 0039d316-1c4b-4281-b951-d872f2087c98

ui/events/cocoa/events_mac.mm

@@ -41,6 +41,7 @@ EventType EventTypeFromNative(const base::NativeEvent& native_event) {
     case NSOtherMouseDragged:
       return ET_MOUSE_DRAGGED;
     case NSMouseMoved:
+      return ET_MOUSE_MOVED;
     case NSScrollWheel:
       return ET_MOUSEWHEEL;
     case NSMouseEntered:

ui/events/cocoa/events_mac_unittest.mm

@@ -288,4 +288,28 @@ TEST_F(EventsMacTest, NativeTitlebarEventLocation) {
             ui::EventLocationFromNative(event));
 }
 
+// Testing for ui::EventTypeFromNative() not covered by ButtonEvents.
+TEST_F(EventsMacTest, EventTypeFromNative) {
+  NSEvent* event = cocoa_test_event_utils::KeyEventWithType(NSKeyDown, 0);
+  EXPECT_EQ(ui::ET_KEY_PRESSED, ui::EventTypeFromNative(event));
+
+  event = cocoa_test_event_utils::KeyEventWithType(NSKeyUp, 0);
+  EXPECT_EQ(ui::ET_KEY_RELEASED, ui::EventTypeFromNative(event));
+
+  event = cocoa_test_event_utils::MouseEventWithType(NSLeftMouseDragged, 0);
+  EXPECT_EQ(ui::ET_MOUSE_DRAGGED, ui::EventTypeFromNative(event));
+  event = cocoa_test_event_utils::MouseEventWithType(NSRightMouseDragged, 0);
+  EXPECT_EQ(ui::ET_MOUSE_DRAGGED, ui::EventTypeFromNative(event));
+  event = cocoa_test_event_utils::MouseEventWithType(NSOtherMouseDragged, 0);
+  EXPECT_EQ(ui::ET_MOUSE_DRAGGED, ui::EventTypeFromNative(event));
+
+  event = cocoa_test_event_utils::MouseEventWithType(NSMouseMoved, 0);
+  EXPECT_EQ(ui::ET_MOUSE_MOVED, ui::EventTypeFromNative(event));
+
+  event = cocoa_test_event_utils::EnterExitEventWithType(NSMouseEntered);
+  EXPECT_EQ(ui::ET_MOUSE_ENTERED, ui::EventTypeFromNative(event));
+  event = cocoa_test_event_utils::EnterExitEventWithType(NSMouseExited);
+  EXPECT_EQ(ui::ET_MOUSE_EXITED, ui::EventTypeFromNative(event));
+}
+
 }  // namespace ui