Add id properties to PointerEvent

ui/chromeos/touch_exploration_controller_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 "ui/chromeos/touch_exploration_controller.h"
 
 #include <math.h>
 #include <stddef.h>
 
 #include <memory>
@@ skipping 414 matching lines @@
 
 // Executes a number of assertions to confirm that |e1| and |e2| are touch
 // events and are equal to each other.
 void ConfirmEventsAreTouchAndEqual(ui::Event* e1, ui::Event* e2) {
   ASSERT_TRUE(e1->IsTouchEvent());
   ASSERT_TRUE(e2->IsTouchEvent());
   ui::TouchEvent* touch_event1 = e1->AsTouchEvent();
   ui::TouchEvent* touch_event2 = e2->AsTouchEvent();
   EXPECT_EQ(touch_event1->type(), touch_event2->type());
   EXPECT_EQ(touch_event1->location(), touch_event2->location());
-  EXPECT_EQ(touch_event1->touch_id(), touch_event2->touch_id());
+  EXPECT_EQ(touch_event1->pointer_details().id,
+            touch_event2->pointer_details().id);
   EXPECT_EQ(touch_event1->flags(), touch_event2->flags());
   EXPECT_EQ(touch_event1->time_stamp(), touch_event2->time_stamp());
 }
 
 // Executes a number of assertions to confirm that |e1| and |e2| are mouse
 // events and are equal to each other.
 void ConfirmEventsAreMouseAndEqual(ui::Event* e1, ui::Event* e2) {
   ASSERT_TRUE(e1->IsMouseEvent());
   ASSERT_TRUE(e2->IsMouseEvent());
   ui::MouseEvent* mouse_event1 = e1->AsMouseEvent();
@@ skipping 934 matching lines @@
       // dispatched..
       EventTestApi test_dispatch(next_dispatch);
       test_dispatch.set_time_stamp(Now());
       generator_->Dispatch(next_dispatch);
       queued_events.erase(queued_events.begin() + index);
 
       // Keep track of what fingers have been pressed, to release
       // only those fingers at the end, so the check for being in
       // no fingers down can be accurate.
       if (next_dispatch->type() == ET_TOUCH_PRESSED) {
-        fingers_pressed[next_dispatch->touch_id()] = true;
+        fingers_pressed[next_dispatch->pointer_details().id] = true;
       } else if (next_dispatch->type() == ET_TOUCH_RELEASED) {
-        fingers_pressed[next_dispatch->touch_id()] = false;
+        fingers_pressed[next_dispatch->pointer_details().id] = false;
       }
     }
     ASSERT_EQ(queued_events.size(), 0u);
 
     // Release fingers recorded as pressed.
     for(int j = 0; j < int(fingers_pressed.size()); j++){
       if (fingers_pressed[j] == true) {
         generator_->ReleaseTouchId(j);
         fingers_pressed[j] = false;
       }
@@ skipping 532 matching lines @@
     AdvanceSimulatedTimePastTapDelay();
     EXPECT_TRUE(IsInNoFingersDownState());
 
     ASSERT_EQ(1U, GetCapturedEvents().size());
     EXPECT_EQ(ui::ET_MOUSE_MOVED, GetCapturedEvents()[0]->type());
     ClearCapturedEvents();
   }
 }
 
 }  // namespace ui