Add id properties to PointerEvent

ash/host/ash_window_tree_host_x11_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 "ash/host/ash_window_tree_host_x11.h"
 
 #undef None
 #undef Bool
 
 #include "base/sys_info.h"
@@ skipping 15 matching lines @@
       : target_(host->window()),
         last_touch_type_(ui::ET_UNKNOWN),
         last_touch_id_(-1),
         last_touch_location_(0, 0) {
     target_->AddPreTargetHandler(this);
   }
   ~RootWindowEventHandler() override { target_->RemovePreTargetHandler(this); }
 
   // ui::EventHandler:
   void OnTouchEvent(ui::TouchEvent* event) override {
-    last_touch_id_ = event->touch_id();
+    last_touch_id_ = event->pointer_details().id;
     last_touch_type_ = event->type();
     last_touch_location_ = event->location();
   }
 
   ui::EventType last_touch_type() { return last_touch_type_; }
 
   int last_touch_id() { return last_touch_id_; }
 
   gfx::Point last_touch_location() { return last_touch_location_; }
 
@@ skipping 208 matching lines @@
   EXPECT_EQ(gfx::Point(0, 0), handler1->last_touch_location());
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, handler2->last_touch_type());
   EXPECT_EQ(1, handler2->last_touch_id());
   EXPECT_EQ(gfx::Point(1600, 2650), handler2->last_touch_location());
 
   handler1.reset();
   handler2.reset();
 }
 
 }  // namespace aura