Set the unique_event_id when converting from TouchEvent to WebTouchEvent

ui/events/gesture_detection/motion_event_generic_unittest.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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 #include "ui/events/test/motion_event_test_utils.h"
 
 namespace ui {
 
 TEST(MotionEventGenericTest, Basic) {
   base::TimeTicks event_time = base::TimeTicks::Now();
   MotionEventGeneric event(
       MotionEvent::ACTION_DOWN, event_time, PointerProperties());
   EXPECT_EQ(1U, event.GetPointerCount());
   EXPECT_EQ(0U, event.GetHistorySize());
   EXPECT_EQ(event_time, event.GetEventTime());
 
+  DCHECK_NE(0U, event.GetUniqueEventId());
+  event.set_unique_event_id(123456U);
+  EXPECT_EQ(123456U, event.GetUniqueEventId());
+
   event.PushPointer(PointerProperties(8.3f, 4.7f, 0.9f));
   ASSERT_EQ(2U, event.GetPointerCount());
   EXPECT_EQ(8.3f, event.GetX(1));
   EXPECT_EQ(4.7f, event.GetY(1));
 
   event.PushPointer(PointerProperties(2.3f, -3.7f, 5.8f));
   ASSERT_EQ(3U, event.GetPointerCount());
   EXPECT_EQ(2.3f, event.GetX(2));
   EXPECT_EQ(-3.7f, event.GetY(2));
 
-  event.set_id(1);
-  EXPECT_EQ(1, event.GetId());
+  event.pointer(0).id = 3;
+  EXPECT_EQ(3, event.GetPointerId(0));
 
   event.set_action(MotionEvent::ACTION_POINTER_DOWN);
   EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
 
   event_time += base::TimeDelta::FromMilliseconds(5);
   event.set_event_time(event_time);
   EXPECT_EQ(event_time, event.GetEventTime());
 
   event.set_button_state(MotionEvent::BUTTON_PRIMARY);
   EXPECT_EQ(MotionEvent::BUTTON_PRIMARY, event.GetButtonState());
@@ skipping 29 matching lines @@
   EXPECT_EQ(2.f, event.GetHistoricalTouchMajor(1, 0));
   EXPECT_EQ(4.8f, event.GetHistoricalX(2, 0));
   EXPECT_EQ(9.6f, event.GetHistoricalY(2, 0));
   EXPECT_EQ(3.f, event.GetHistoricalTouchMajor(2, 0));
 }
 
 TEST(MotionEventGenericTest, Clone) {
   MotionEventGeneric event(MotionEvent::ACTION_DOWN,
                            base::TimeTicks::Now(),
                            PointerProperties(8.3f, 4.7f, 2.f));
-  event.set_id(1);
   event.set_button_state(MotionEvent::BUTTON_PRIMARY);
 
   scoped_ptr<MotionEvent> clone = event.Clone();
   ASSERT_TRUE(clone);
+  EXPECT_EQ(event.GetUniqueEventId(), clone->GetUniqueEventId());
   EXPECT_EQ(test::ToString(event), test::ToString(*clone));
 }
 
 TEST(MotionEventGenericTest, CloneWithHistory) {
   base::TimeTicks event_time = base::TimeTicks::Now();
   base::TimeTicks historical_event_time =
       event_time - base::TimeDelta::FromMilliseconds(5);
 
   PointerProperties pointer(8.3f, 4.7f, 10.1f);
   MotionEventGeneric event(MotionEvent::ACTION_MOVE, event_time, pointer);
 
   PointerProperties historical_pointer(3.4f, -4.3f, 11.5);
   scoped_ptr<MotionEvent> historical_event(new MotionEventGeneric(
       MotionEvent::ACTION_MOVE, historical_event_time, historical_pointer));
 
   event.PushHistoricalEvent(historical_event.Pass());
   EXPECT_EQ(1U, event.GetHistorySize());
 
   scoped_ptr<MotionEvent> clone = event.Clone();
   ASSERT_TRUE(clone);
+  EXPECT_EQ(event.GetUniqueEventId(), clone->GetUniqueEventId());
   EXPECT_EQ(test::ToString(event), test::ToString(*clone));
 }
 
 TEST(MotionEventGenericTest, Cancel) {
   MotionEventGeneric event(MotionEvent::ACTION_UP,
                            base::TimeTicks::Now(),
                            PointerProperties(8.7f, 4.3f, 1.f));
-  event.set_id(2);
   event.set_button_state(MotionEvent::BUTTON_SECONDARY);
 
   scoped_ptr<MotionEvent> cancel = event.Cancel();
   event.set_action(MotionEvent::ACTION_CANCEL);
   ASSERT_TRUE(cancel);
+  EXPECT_NE(event.GetUniqueEventId(), cancel->GetUniqueEventId());
   EXPECT_EQ(test::ToString(event), test::ToString(*cancel));
 }
 
 TEST(MotionEventGenericTest, FindPointerIndexOfId) {
   base::TimeTicks event_time = base::TimeTicks::Now();
   PointerProperties pointer;
   pointer.id = 0;
   MotionEventGeneric event0(MotionEvent::ACTION_DOWN, event_time, pointer);
   EXPECT_EQ(0, event0.FindPointerIndexOfId(0));
   EXPECT_EQ(-1, event0.FindPointerIndexOfId(1));
@@ skipping 84 matching lines @@
   ASSERT_EQ(2U, event.GetHistorySize());
   ASSERT_EQ(2U, event.GetPointerCount());
 
   // Do a basic smoke exercise of event stringification to ensure things don't
   // explode in the process.
   std::string event_string = test::ToString(event);
   EXPECT_FALSE(event_string.empty());
 }
 
 }  // namespace ui