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

ui/events/cocoa/events_mac_unittest.mm

 // Copyright 2014 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 "ui/events/event_utils.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 270 matching lines @@
   // Removing the border, and sending the same event should move it down in the
   // toolkit-views coordinate system.
   int height_change = NSHeight(frame_rect) - kTestHeight;
   EXPECT_GT(height_change, 0);
   [test_window() setStyleMask:NSBorderlessWindowMask];
   [test_window() setFrame:frame_rect display:YES];
   EXPECT_EQ(gfx::Point(0, kTestHeight + height_change),
             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