Add POINTER_WHEEL_CHANGED event to mojo.

ui/events/mojo/struct_traits_unittest.cc

 // Copyright 2016 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 "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/mojo/traits_test_service.mojom.h"
 
@@ skipping 189 matching lines @@
     EXPECT_EQ(kTestData[i].location(), output_ptr_event->location());
     EXPECT_EQ(kTestData[i].root_location(), output_ptr_event->root_location());
     EXPECT_EQ(kTestData[i].pointer_id(), output_ptr_event->pointer_id());
     EXPECT_EQ(kTestData[i].changed_button_flags(),
               output_ptr_event->changed_button_flags());
     EXPECT_EQ(kTestData[i].pointer_details(),
               output_ptr_event->pointer_details());
   }
 }
 
-TEST_F(StructTraitsTest, MouseWheelEvent) {
+TEST_F(StructTraitsTest, PointerWheelEvent) {
   MouseWheelEvent kTestData[] = {
       {gfx::Vector2d(11, 15), gfx::Point(3, 4), gfx::Point(40, 30),
        base::TimeTicks(), EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON},
       {gfx::Vector2d(-5, 3), gfx::Point(40, 3), gfx::Point(4, 0),
        base::TimeTicks(), EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
        EF_MIDDLE_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON},
       {gfx::Vector2d(1, 0), gfx::Point(3, 4), gfx::Point(40, 30),
        base::TimeTicks(), EF_NONE, EF_NONE},
   };
 
   mojom::TraitsTestServicePtr proxy = GetTraitsTestProxy();
   for (size_t i = 0; i < arraysize(kTestData); i++) {
     std::unique_ptr<Event> output;
-    proxy->EchoEvent(Event::Clone(kTestData[i]), &output);
-    EXPECT_TRUE(output->IsMouseWheelEvent());
+    proxy->EchoEvent(Event::Clone(ui::PointerEvent(kTestData[i])), &output);
+    EXPECT_EQ(ET_POINTER_WHEEL_CHANGED, output->type());
 
-    const MouseWheelEvent* output_wheel_event = output->AsMouseWheelEvent();
-    EXPECT_EQ(kTestData[i].type(), output_wheel_event->type());
-    EXPECT_EQ(kTestData[i].flags(), output_wheel_event->flags());
-    EXPECT_EQ(kTestData[i].location(), output_wheel_event->location());
+    const PointerEvent* output_pointer_event = output->AsPointerEvent();
+    EXPECT_EQ(ET_POINTER_WHEEL_CHANGED, output_pointer_event->type());
+    EXPECT_EQ(kTestData[i].flags(), output_pointer_event->flags());
+    EXPECT_EQ(kTestData[i].location(), output_pointer_event->location());
     EXPECT_EQ(kTestData[i].root_location(),
-              output_wheel_event->root_location());
-    EXPECT_EQ(kTestData[i].offset(), output_wheel_event->offset());
+              output_pointer_event->root_location());
+    EXPECT_EQ(kTestData[i].offset(),
+              output_pointer_event->pointer_details().offset);
   }
 }
 
 }  // namespace ui