Add PointerDetails to ui::MouseEvent's constructors

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 "ui/events/event.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 690 matching lines @@
   EXPECT_EQ(0.0f, mouse_event.pointer_details().radius_y);
   EXPECT_TRUE(std::isnan(mouse_event.pointer_details().force));
   EXPECT_EQ(0.0f, mouse_event.pointer_details().tilt_x);
   EXPECT_EQ(0.0f, mouse_event.pointer_details().tilt_y);
 
   ui::MouseEvent mouse_event_copy(mouse_event);
   EXPECT_EQ(mouse_event.pointer_details(), mouse_event_copy.pointer_details());
 }
 
 TEST(EventTest, PointerDetailsStylus) {
-  ui::MouseEvent stylus_event(ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                              gfx::Point(0, 0), ui::EventTimeForNow(), 0, 0);
   ui::PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
                                      /* pointer_id*/ 0,
                                      /* radius_x */ 0.0f,
                                      /* radius_y */ 0.0f,
                                      /* force */ 21.0f,
                                      /* tilt_x */ 45.0f,
                                      /* tilt_y */ -45.0f,
                                      /* tangential_pressure */ 0.7f,
                                      /* twist */ 196);
 
-  stylus_event.set_pointer_details(pointer_details);
+  ui::MouseEvent stylus_event(ET_MOUSE_PRESSED, gfx::Point(0, 0),
+                              gfx::Point(0, 0), ui::EventTimeForNow(), 0, 0,
+                              pointer_details);
   EXPECT_EQ(EventPointerType::POINTER_TYPE_PEN,
             stylus_event.pointer_details().pointer_type);
   EXPECT_EQ(21.0f, stylus_event.pointer_details().force);
   EXPECT_EQ(45.0f, stylus_event.pointer_details().tilt_x);
   EXPECT_EQ(-45.0f, stylus_event.pointer_details().tilt_y);
   EXPECT_EQ(0.0f, stylus_event.pointer_details().radius_x);
   EXPECT_EQ(0.0f, stylus_event.pointer_details().radius_y);
   EXPECT_EQ(0.7f, stylus_event.pointer_details().tangential_pressure);
   EXPECT_EQ(196, stylus_event.pointer_details().twist);
 
@@ skipping 115 matching lines @@
     EXPECT_TRUE(pointer_event.IsPointerEvent());
   }
 }
 
 TEST(EventTest, PointerEventId) {
   {
     ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
                                gfx::Point(0, 0), base::TimeTicks(), 0, 0);
     ui::PointerEvent pointer_event(mouse_event);
     EXPECT_EQ(pointer_event.pointer_details().id,
-              ui::PointerEvent::kMousePointerId);
+              ui::MouseEvent::kMousePointerId);
   }
 
   for (int touch_id = 0; touch_id < 8; touch_id++) {
     ui::TouchEvent touch_event(
         ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), base::TimeTicks(),
         PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, touch_id));
     ui::PointerEvent pointer_event(touch_event);
     EXPECT_EQ(pointer_event.pointer_details().id, touch_id);
   }
 }
@@ skipping 222 matching lines @@
   XButtonEvent* button_event = &(native_event.xbutton);
   button_event->type = ButtonPress;
   button_event->button = 4; // A valid wheel button number between min and max.
   MouseWheelEvent mouse_ev(&native_event);
 
   histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1);
 #endif
 }
 
 }  // namespace ui