| Index: ui/events/event_unittest.cc
|
| diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
|
| index 6989ac01c6a599997e7b34bc84ad23504565cd32..a115bd9b274df4c9948b80b4ba0d4ae0c6738923 100644
|
| --- a/ui/events/event_unittest.cc
|
| +++ b/ui/events/event_unittest.cc
|
| @@ -738,12 +738,9 @@ TEST(EventTest, PointerEventCanConvertFrom) {
|
|
|
| // 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
|
| + ET_MOUSE_PRESSED, ET_MOUSE_DRAGGED, ET_MOUSE_MOVED,
|
| + ET_MOUSE_ENTERED, ET_MOUSE_EXITED, ET_MOUSE_RELEASED,
|
| + ET_MOUSEWHEEL, ET_MOUSE_CAPTURE_CHANGED,
|
| };
|
| for (size_t i = 0; i < arraysize(mouse_allowed); i++) {
|
| MouseEvent event(mouse_allowed[i], point, point, time, 0, 0);
|
| @@ -762,16 +759,6 @@ TEST(EventTest, PointerEventCanConvertFrom) {
|
| EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
|
| }
|
|
|
| - // Capture changes cannot be converted.
|
| - EXPECT_FALSE(
|
| - PointerEvent::CanConvertFrom(
|
| - MouseEvent(ET_MOUSE_CAPTURE_CHANGED, point, point, time, 0, 0)));
|
| -
|
| - // Wheel events cannot be converted.
|
| - EXPECT_FALSE(
|
| - PointerEvent::CanConvertFrom(
|
| - MouseWheelEvent(gfx::Vector2d(), point, point, time, 0, 0)));
|
| -
|
| // Non-mouse non-touch events cannot be converted.
|
| EXPECT_FALSE(
|
| PointerEvent::CanConvertFrom(
|
|
|