Revert of Don't refcount tracking id -> slot id mapping.

ui/events/x/events_x_unittest.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 <cstring>
 #include <set>
 
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ skipping 282 matching lines @@
 
 int GetTouchIdForTrackingId(uint32 tracking_id) {
   int slot = 0;
   bool success =
       TouchFactory::GetInstance()->QuerySlotForTrackingID(tracking_id, &slot);
   if (success)
     return slot;
   return -1;
 }
 
-TEST_F(EventsXTest, TouchEventNotRemovingFromNativeMapping) {
+TEST_F(EventsXTest, TouchEventIdRefcounting) {
   std::vector<unsigned int> devices;
   devices.push_back(0);
   ui::SetUpTouchDevicesForTest(devices);
   std::vector<Valuator> valuators;
 
-  const int kTrackingId = 5;
+  const int kTrackingId0 = 5;
+  const int kTrackingId1 = 7;
 
-  // Two touch presses with the same tracking id.
+  // Increment ref count once for first touch.
   ui::ScopedXI2Event xpress0;
   xpress0.InitTouchEvent(
-      0, XI_TouchBegin, kTrackingId, gfx::Point(10, 10), valuators);
+      0, XI_TouchBegin, kTrackingId0, gfx::Point(10, 10), valuators);
   scoped_ptr<ui::TouchEvent> upress0(new ui::TouchEvent(xpress0));
-  EXPECT_EQ(0, GetTouchIdForTrackingId(kTrackingId));
+  EXPECT_EQ(0, GetTouchIdForTrackingId(kTrackingId0));
 
+  // Increment ref count 4 times for second touch.
   ui::ScopedXI2Event xpress1;
   xpress1.InitTouchEvent(
-      0, XI_TouchBegin, kTrackingId, gfx::Point(20, 20), valuators);
-  ui::TouchEvent upress1(xpress1);
-  EXPECT_EQ(0, GetTouchIdForTrackingId(kTrackingId));
+      0, XI_TouchBegin, kTrackingId1, gfx::Point(20, 20), valuators);
 
-  // The first touch release shouldn't clear the mapping from the
-  // tracking id.
+  for (int i = 0; i < 4; ++i) {
+    ui::TouchEvent upress1(xpress1);
+    EXPECT_EQ(1, GetTouchIdForTrackingId(kTrackingId1));
+  }
+
+  ui::ScopedXI2Event xrelease1;
+  xrelease1.InitTouchEvent(
+      0, XI_TouchEnd, kTrackingId1, gfx::Point(10, 10), valuators);
+
+  // Decrement ref count 3 times for second touch.
+  for (int i = 0; i < 3; ++i) {
+    ui::TouchEvent urelease1(xrelease1);
+    EXPECT_EQ(1, GetTouchIdForTrackingId(kTrackingId1));
+  }
+
+  // This should clear the touch id of the second touch.
+  scoped_ptr<ui::TouchEvent> urelease1(new ui::TouchEvent(xrelease1));
+  urelease1.reset();
+  EXPECT_EQ(-1, GetTouchIdForTrackingId(kTrackingId1));
+
+  // This should clear the touch id of the first touch.
   ui::ScopedXI2Event xrelease0;
   xrelease0.InitTouchEvent(
-      0, XI_TouchEnd, kTrackingId, gfx::Point(10, 10), valuators);
-  {
-    ui::TouchEvent urelease0(xrelease0);
-    urelease0.set_should_remove_native_touch_id_mapping(false);
-  }
-  EXPECT_EQ(0, GetTouchIdForTrackingId(kTrackingId));
-
-  // The second touch release should clear the mapping from the
-  // tracking id.
-  ui::ScopedXI2Event xrelease1;
-  xrelease1.InitTouchEvent(
-      0, XI_TouchEnd, kTrackingId, gfx::Point(10, 10), valuators);
-  {
-    ui::TouchEvent urelease1(xrelease1);
-  }
-  EXPECT_EQ(-1, GetTouchIdForTrackingId(kTrackingId));
+      0, XI_TouchEnd, kTrackingId0, gfx::Point(10, 10), valuators);
+  scoped_ptr<ui::TouchEvent> urelease0(new ui::TouchEvent(xrelease0));
+  urelease0.reset();
+  EXPECT_EQ(-1, GetTouchIdForTrackingId(kTrackingId0));
 }
 
 TEST_F(EventsXTest, NumpadKeyEvents) {
   XEvent event;
   Display* display = gfx::GetXDisplay();
 
   struct {
     bool is_numpad_key;
     int x_keysym;
   } keys[] = {
@@ skipping 268 matching lines @@
         KeyEventTestApi test_event(&key_event);
         test_event.set_is_char(true);
       }
       EXPECT_FALSE(key_event.flags() & ui::EF_IME_FABRICATED_KEY);
     }
   }
 }
 #endif
 
 }  // namespace ui