mash: Fix DCHECK when clicking on window close box

ui/events/event_unittest.cc

Index: ui/events/event_unittest.cc
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
index 2090055f659915ed3a36e80cba127a33fa793e80..8742b5e8a4fffaf9ad2b3bae886a9dfa14f3cfd5 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -725,6 +725,52 @@ TEST(EventTest, PointerDetailsCustomTouch) {
   EXPECT_EQ(touch_event.pointer_details(), touch_event_copy.pointer_details());
 }
 
+TEST(EventTest, PointerEventCanConvertFrom) {
+  const gfx::Point origin(0, 0);

[msw, 2016/03/29 17:50:27]

nit: use Point default ctor

[James Cook, 2016/03/29 18:23:27]

Done and renamed to 'point' because the location isn't important.

+  const base::TimeDelta time;
+
+  // Common mouse events can be converted.
+  const EventType mouse_allowed[] = {
+      ET_MOUSE_PRESSED,
+      ET_MOUSE_DRAGGED,
+      ET_MOUSE_MOVED,
+      ET_MOUSE_ENTERED,
+      ET_MOUSE_EXITED,
+      ET_MOUSE_RELEASED
+  };
+  for (size_t i = 0; i < arraysize(mouse_allowed); i++) {
+    MouseEvent event(mouse_allowed[i], origin, origin, time, 0, 0);
+    EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
+  }
+
+  // Common touch events can be converted.
+  const EventType touch_allowed[] = {
+      ET_TOUCH_PRESSED,
+      ET_TOUCH_MOVED,
+      ET_TOUCH_RELEASED,
+      ET_TOUCH_CANCELLED
+  };
+  for (size_t i = 0; i < arraysize(touch_allowed); i++) {
+    TouchEvent event(touch_allowed[i], origin, 0, time);
+    EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
+  }
+
+  // Capture changes cannot be converted.
+  EXPECT_FALSE(
+      PointerEvent::CanConvertFrom(
+          MouseEvent(ET_MOUSE_CAPTURE_CHANGED, origin, origin, time, 0, 0)));
+
+  // Wheel events cannot be converted.
+  EXPECT_FALSE(
+      PointerEvent::CanConvertFrom(
+          MouseWheelEvent(gfx::Vector2d(0, 0), origin, origin, time, 0, 0)));

[msw, 2016/03/29 17:50:27]

nit: use Vector2d default ctor

[James Cook, 2016/03/29 18:23:27]

Done.

+
+  // Non-mouse non-touch events cannot be converted.
+  EXPECT_FALSE(
+      PointerEvent::CanConvertFrom(
+          KeyEvent(ET_KEY_PRESSED, VKEY_SPACE, EF_NONE)));
+}
+
 TEST(EventTest, PointerEventType) {
   const ui::EventType kMouseTypeMap[][2] = {
       {ui::ET_MOUSE_PRESSED, ui::ET_POINTER_DOWN},