Set the unique_event_id when converting from TouchEvent to WebTouchEvent

ui/events/gestures/gesture_provider_aura.cc

 // Copyright 2014 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/gestures/gesture_provider_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "ui/events/event.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
@@ skipping 12 matching lines @@
           std::numeric_limits<unsigned long long>::max()) {
   filtered_gesture_provider_.SetDoubleTapSupportForPlatformEnabled(false);
 }
 
 GestureProviderAura::~GestureProviderAura() {}
 
 bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
   if (!pointer_state_.OnTouch(*event))
     return false;
 
-  last_unique_touch_event_id_ = event->unique_event_id();
+  last_unique_touch_event_id_ = event->unique_touch_event_id();
   last_touch_event_latency_info_ = *event->latency();
 
   auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
   if (!result.succeeded)
     return false;
 
   event->set_may_cause_scrolling(result.did_generate_scroll);
   pointer_state_.CleanupRemovedTouchPoints(*event);
   return true;
 }
 
 void GestureProviderAura::OnAsyncTouchEventAck(bool event_consumed) {
   DCHECK(pending_gestures_.empty());
   DCHECK(!handling_event_);
   base::AutoReset<bool> handling_event(&handling_event_, true);
   filtered_gesture_provider_.OnAsyncTouchEventAck(event_consumed);
   last_touch_event_latency_info_.Clear();
 }
 
-void GestureProviderAura::OnSyncTouchEventAck(const uint64 unique_event_id,
-                                              bool event_consumed) {
-  DCHECK_EQ(last_unique_touch_event_id_, unique_event_id);
+void GestureProviderAura::OnSyncTouchEventAck(
+    const uint32 unique_touch_event_id, bool event_consumed) {
+  DCHECK_EQ(last_unique_touch_event_id_, unique_touch_event_id);
   DCHECK(pending_gestures_.empty());
   DCHECK(!handling_event_);
   base::AutoReset<bool> handling_event(&handling_event_, true);
   filtered_gesture_provider_.OnSyncTouchEventAck(event_consumed);
   last_touch_event_latency_info_.Clear();
 }
 
 void GestureProviderAura::OnGestureEvent(
     const GestureEventData& gesture) {
   GestureEventDetails details = gesture.details;
@@ skipping 64 matching lines @@
   float double_tap_slop_square =
       GestureConfiguration::GetInstance()
           ->max_distance_between_taps_for_double_tap();
   double_tap_slop_square *= double_tap_slop_square;
   const float delta_x = previous_tap.x - current_tap.x;
   const float delta_y = previous_tap.y - current_tap.y;
   return (delta_x * delta_x + delta_y * delta_y < double_tap_slop_square);
 }
 
 }  // namespace content