Set the unique_event_id when converting from TouchEvent to WebTouchEvent

ui/events/event.cc

Index: ui/events/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 4649e24db9f8722b8bad8d3a7aeeed8acaf9540d..fdf17f994039d6a57cd5da943f6e5fff981d3086 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -15,6 +15,7 @@
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/keycodes/dom3/dom_key.h"
@@ -110,11 +111,6 @@ bool X11EventHasNonStandardState(const base::NativeEvent& event) {
 #endif
 }
 
-unsigned long long get_next_touch_event_id() {
-  static unsigned long long id = 0;
-  return id++;
-}
-
 }  // namespace
 
 namespace ui {
@@ -519,7 +515,7 @@ const int MouseWheelEvent::kWheelDelta = 53;
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       touch_id_(GetTouchId(native_event)),
-      unique_event_id_(get_next_touch_event_id()),
+      unique_event_id_(ui::GetNextTouchEventId()),
       radius_x_(GetTouchRadiusX(native_event)),
       radius_y_(GetTouchRadiusY(native_event)),
       rotation_angle_(GetTouchAngle(native_event)),
@@ -542,7 +538,7 @@ TouchEvent::TouchEvent(EventType type,
                        base::TimeDelta time_stamp)
     : LocatedEvent(type, location, location, time_stamp, 0),
       touch_id_(touch_id),
-      unique_event_id_(get_next_touch_event_id()),
+      unique_event_id_(ui::GetNextTouchEventId()),
       radius_x_(0.0f),
       radius_y_(0.0f),
       rotation_angle_(0.0f),
@@ -563,7 +559,7 @@ TouchEvent::TouchEvent(EventType type,
                        float force)
     : LocatedEvent(type, location, location, time_stamp, flags),
       touch_id_(touch_id),
-      unique_event_id_(get_next_touch_event_id()),
+      unique_event_id_(ui::GetNextTouchEventId()),
       radius_x_(radius_x),
       radius_y_(radius_y),
       rotation_angle_(angle),