Set the unique_event_id when converting from TouchEvent to WebTouchEvent

ui/events/gestures/gesture_recognizer_impl.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/gestures/gesture_recognizer_impl.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 233 matching lines @@
   SetupTargets(*event, consumer);
 
   if (event->result() & ER_CONSUMED)
     return false;
 
   GestureProviderAura* gesture_provider =
       GetGestureProviderForConsumer(consumer);
   return gesture_provider->OnTouchEvent(event);
 }
 
-// TODO(tdresser): we should take a unique_event_id here, and validate
+// TODO(tdresser): we should take a unique_touch_event_id here, and validate
 // that the correct event is being acked. See crbug.com/457669 for
 // details.
 GestureRecognizer::Gestures*
 GestureRecognizerImpl::AckAsyncTouchEvent(
     ui::EventResult result,
     GestureConsumer* consumer) {
   GestureProviderAura* gesture_provider =
       GetGestureProviderForConsumer(consumer);
   gesture_provider->OnAsyncTouchEventAck(result != ER_UNHANDLED);
   return gesture_provider->GetAndResetPendingGestures();
 }
 
 GestureRecognizer::Gestures* GestureRecognizerImpl::AckSyncTouchEvent(
-    const uint64 unique_event_id,
+    const uint64 unique_touch_event_id,
     ui::EventResult result,
     GestureConsumer* consumer) {
   GestureProviderAura* gesture_provider =
       GetGestureProviderForConsumer(consumer);
-  gesture_provider->OnSyncTouchEventAck(unique_event_id,
+  gesture_provider->OnSyncTouchEventAck(unique_touch_event_id,
                                         result != ER_UNHANDLED);
   return gesture_provider->GetAndResetPendingGestures();
 }
 
 bool GestureRecognizerImpl::CleanupStateForConsumer(
     GestureConsumer* consumer) {
   bool state_cleaned_up = false;
 
   if (consumer_gesture_provider_.count(consumer)) {
     state_cleaned_up = true;
@@ skipping 60 matching lines @@
   std::vector<GestureEventHelper*>::iterator it;
   for (it = helpers.begin(); it != helpers.end(); ++it)
     gesture_recognizer->AddGestureEventHelper(*it);
 
   helpers.clear();
   g_gesture_recognizer_instance =
       static_cast<GestureRecognizerImpl*>(gesture_recognizer);
 }
 
 }  // namespace ui