Set the unique_event_id when converting from TouchEvent to WebTouchEvent

ui/events/test/motion_event_test_utils.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/test/motion_event_test_utils.h"
 
 #include <sstream>
 
 #include "base/logging.h"
 #include "ui/events/gesture_detection/bitset_32.h"
@@ skipping 148 matching lines @@
     case ACTION_UP:
     case ACTION_POINTER_UP:
     case ACTION_CANCEL:
       PopPointer();
       return;
     default:
       break;
   }
 }
 
+void MockMotionEvent::SetPrimaryPointerId(int id) {
+  DCHECK_GT(GetPointerCount(), 0U);
+  pointer(0).id = id;
+}
+
 std::string ToString(const MotionEvent& event) {
   std::stringstream ss;
   ss << "MotionEvent {"
-     << "\n ID: " << event.GetId() << "\n Action: " << event.GetAction();
+     << "\n ID: " << event.GetUniqueEventId()
+     << "\n Action: " << event.GetAction();
   if (event.GetAction() == MotionEvent::ACTION_POINTER_DOWN ||
       event.GetAction() == MotionEvent::ACTION_POINTER_UP)
     ss << "\n ActionIndex: " << event.GetActionIndex();
   ss << "\n Flags: " << event.GetFlags()
      << "\n ButtonState: " << event.GetButtonState() << "\n Pointers: [";
   const size_t pointer_count = event.GetPointerCount();
   const size_t history_size = event.GetHistorySize();
 
   BitSet32 pointer_ids;
   for (size_t i = 0; i < pointer_count; ++i) {
     pointer_ids.mark_bit(event.GetPointerId(i));
 
     // Print the pointers sorted by id.
     while (!pointer_ids.is_empty()) {
       int pi = event.FindPointerIndexOfId(pointer_ids.first_marked_bit());
       DCHECK_GE(pi, 0);
       pointer_ids.clear_first_marked_bit();
       ss << "{"
+          << "\n PointerId: (" << event.GetPointerId(pi) << ")"
          << "\n  Pos: (" << event.GetX(pi) << ", " << event.GetY(pi) << ")"
          << "\n  RawPos: (" << event.GetX(pi) << ", " << event.GetY(pi) << ")"
          << "\n  Size: (" << event.GetTouchMajor(pi) << ", "
          << event.GetTouchMinor(pi) << ")"
          << "\n  Orientation: " << event.GetOrientation(pi)
          << "\n  Pressure: " << event.GetOrientation(pi)
          << "\n  Tool: " << event.GetToolType(pi);
       if (history_size) {
         ss << "\n  History: [";
         for (size_t h = 0; h < history_size; ++h) {
@@ skipping 11 matching lines @@
         ss << ", ";
     }
     ss << "]\n}";
   }
 
   return ss.str();
 }
 
 }  // namespace test
 }  // namespace ui