mash: Fix DCHECK when clicking on window close box

ui/events/event_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
@@ skipping 707 matching lines @@
   EXPECT_EQ(21.0f, touch_event.pointer_details().force);
   EXPECT_EQ(45.0f, touch_event.pointer_details().tilt_x);
   EXPECT_EQ(-45.0f, touch_event.pointer_details().tilt_y);
   EXPECT_EQ(5.0f, touch_event.pointer_details().radius_x);
   EXPECT_EQ(6.0f, touch_event.pointer_details().radius_y);
 
   ui::TouchEvent touch_event_copy(touch_event);
   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},
       {ui::ET_MOUSE_DRAGGED, ui::ET_POINTER_MOVED},
       {ui::ET_MOUSE_MOVED, ui::ET_POINTER_MOVED},
       {ui::ET_MOUSE_ENTERED, ui::ET_POINTER_ENTERED},
       {ui::ET_MOUSE_EXITED, ui::ET_POINTER_EXITED},
       {ui::ET_MOUSE_RELEASED, ui::ET_POINTER_UP},
   };
   const ui::EventType kTouchTypeMap[][2] = {
@@ skipping 90 matching lines @@
 
     EXPECT_EQ(ptr_event.type(), clone_as_ptr->type());
     EXPECT_EQ(ptr_event.pointer_id(), clone_as_ptr->pointer_id());
     EXPECT_EQ(ptr_event.pointer_details(), clone_as_ptr->pointer_details());
     EXPECT_EQ(ptr_event.location(), clone_as_ptr->location());
     EXPECT_EQ(ptr_event.root_location(), clone_as_ptr->root_location());
   }
 }
 
 }  // namespace ui