Revert "ozone: evdev: Use tracking id for TouchEvent finger id"

ui/events/ozone/evdev/touch_event_converter_evdev_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 <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <unistd.h>
 
 #include <vector>
@@ skipping 161 matching lines @@
   dev->ReadNow();
   EXPECT_EQ(1u, dev->size());
 
   ui::TouchEvent* event = dev->event(0);
   EXPECT_FALSE(event == NULL);
 
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, event->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), event->time_stamp());
   EXPECT_EQ(42, event->x());
   EXPECT_EQ(51, event->y());
-  EXPECT_EQ(684, event->touch_id());
+  EXPECT_EQ(0, event->touch_id());
   EXPECT_FLOAT_EQ(1.5f, event->radius_x());
   EXPECT_FLOAT_EQ(.5f, event->force());
   EXPECT_FLOAT_EQ(0.f, event->rotation_angle());
 }
 
 TEST_F(TouchEventConverterEvdevTest, NoEvents) {
   ui::MockTouchEventConverterEvdev* dev = device();
   dev->ConfigureReadMock(NULL, 0, 0);
   EXPECT_EQ(0u, dev->size());
 }
@@ skipping 27 matching lines @@
   dev->ConfigureReadMock(mock_kernel_queue_move1, 4, 0);
   dev->ReadNow();
   EXPECT_EQ(2u, dev->size());
   ui::TouchEvent* event = dev->event(1);
   EXPECT_FALSE(event == NULL);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, event->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), event->time_stamp());
   EXPECT_EQ(42, event->x());
   EXPECT_EQ(43, event->y());
-  EXPECT_EQ(684, event->touch_id());
+  EXPECT_EQ(0, event->touch_id());
   EXPECT_FLOAT_EQ(2.f / 3.f, event->force());
   EXPECT_FLOAT_EQ(0.f, event->rotation_angle());
 
   dev->ConfigureReadMock(mock_kernel_queue_move2, 2, 0);
   dev->ReadNow();
   EXPECT_EQ(3u, dev->size());
   event = dev->event(2);
   EXPECT_FALSE(event == NULL);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, event->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), event->time_stamp());
   EXPECT_EQ(42, event->x());
   EXPECT_EQ(42, event->y());
-  EXPECT_EQ(684, event->touch_id());
+  EXPECT_EQ(0, event->touch_id());
   EXPECT_FLOAT_EQ(2.f / 3.f, event->force());
   EXPECT_FLOAT_EQ(0.f, event->rotation_angle());
 }
 
 TEST_F(TouchEventConverterEvdevTest, TouchRelease) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   struct input_event mock_kernel_queue_press[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, 684},
     {{0, 0}, EV_ABS, ABS_MT_TOUCH_MAJOR, 3},
@@ skipping 16 matching lines @@
   dev->ConfigureReadMock(mock_kernel_queue_release, 2, 0);
   dev->ReadNow();
   EXPECT_EQ(2u, dev->size());
   event = dev->event(1);
   EXPECT_FALSE(event == NULL);
 
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, event->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), event->time_stamp());
   EXPECT_EQ(42, event->x());
   EXPECT_EQ(51, event->y());
-  EXPECT_EQ(684, event->touch_id());
+  EXPECT_EQ(0, event->touch_id());
   EXPECT_FLOAT_EQ(.5f, event->force());
   EXPECT_FLOAT_EQ(0.f, event->rotation_angle());
 }
 
 TEST_F(TouchEventConverterEvdevTest, TwoFingerGesture) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   ui::TouchEvent* ev0;
   ui::TouchEvent* ev1;
 
@@ skipping 30 matching lines @@
   dev->ReadNow();
   EXPECT_EQ(4u, dev->size());
   ev0 = dev->event(2);
   ev1 = dev->event(3);
 
   // Move
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev0->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev0->time_stamp());
   EXPECT_EQ(40, ev0->x());
   EXPECT_EQ(51, ev0->y());
-  EXPECT_EQ(684, ev0->touch_id());
+  EXPECT_EQ(0, ev0->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev0->force());
   EXPECT_FLOAT_EQ(0.f, ev0->rotation_angle());
 
   // Press
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, ev1->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1->time_stamp());
   EXPECT_EQ(101, ev1->x());
   EXPECT_EQ(102, ev1->y());
-  EXPECT_EQ(686, ev1->touch_id());
+  EXPECT_EQ(1, ev1->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev1->force());
   EXPECT_FLOAT_EQ(0.f, ev1->rotation_angle());
 
   // Stationary 0, Moves 1.
   struct input_event mock_kernel_queue_stationary0_move1[] = {
     {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 40}, {{0, 0}, EV_SYN, SYN_REPORT, 0}
   };
   dev->ConfigureReadMock(mock_kernel_queue_stationary0_move1, 2, 0);
   dev->ReadNow();
   EXPECT_EQ(5u, dev->size());
   ev1 = dev->event(4);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev1->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1->time_stamp());
   EXPECT_EQ(40, ev1->x());
   EXPECT_EQ(102, ev1->y());
-  EXPECT_EQ(686, ev1->touch_id());
+  EXPECT_EQ(1, ev1->touch_id());
 
   EXPECT_FLOAT_EQ(.5f, ev1->force());
   EXPECT_FLOAT_EQ(0.f, ev1->rotation_angle());
 
   // Move 0, stationary 1.
   struct input_event mock_kernel_queue_move0_stationary1[] = {
     {{0, 0}, EV_ABS, ABS_MT_SLOT, 0}, {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 39},
     {{0, 0}, EV_SYN, SYN_REPORT, 0}
   };
   dev->ConfigureReadMock(mock_kernel_queue_move0_stationary1, 3, 0);
   dev->ReadNow();
   EXPECT_EQ(6u, dev->size());
   ev0 = dev->event(5);
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev0->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev0->time_stamp());
   EXPECT_EQ(39, ev0->x());
   EXPECT_EQ(51, ev0->y());
-  EXPECT_EQ(684, ev0->touch_id());
+  EXPECT_EQ(0, ev0->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev0->force());
   EXPECT_FLOAT_EQ(0.f, ev0->rotation_angle());
 
   // Release 0, move 1.
   struct input_event mock_kernel_queue_release0_move1[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, -1}, {{0, 0}, EV_ABS, ABS_MT_SLOT, 1},
     {{0, 0}, EV_ABS, ABS_MT_POSITION_X, 38}, {{0, 0}, EV_SYN, SYN_REPORT, 0}
   };
   dev->ConfigureReadMock(mock_kernel_queue_release0_move1, 4, 0);
   dev->ReadNow();
   EXPECT_EQ(8u, dev->size());
   ev0 = dev->event(6);
   ev1 = dev->event(7);
 
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ev0->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev0->time_stamp());
   EXPECT_EQ(39, ev0->x());
   EXPECT_EQ(51, ev0->y());
-  EXPECT_EQ(684, ev0->touch_id());
+  EXPECT_EQ(0, ev0->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev0->force());
   EXPECT_FLOAT_EQ(0.f, ev0->rotation_angle());
 
   EXPECT_EQ(ui::ET_TOUCH_MOVED, ev1->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1->time_stamp());
   EXPECT_EQ(38, ev1->x());
   EXPECT_EQ(102, ev1->y());
-  EXPECT_EQ(686, ev1->touch_id());
+  EXPECT_EQ(1, ev1->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev1->force());
   EXPECT_FLOAT_EQ(0.f, ev1->rotation_angle());
 
   // Release 1.
   struct input_event mock_kernel_queue_release1[] = {
     {{0, 0}, EV_ABS, ABS_MT_TRACKING_ID, -1}, {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
   dev->ConfigureReadMock(mock_kernel_queue_release1, 2, 0);
   dev->ReadNow();
   EXPECT_EQ(9u, dev->size());
   ev1 = dev->event(8);
 
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, ev1->type());
   EXPECT_EQ(base::TimeDelta::FromMicroseconds(0), ev1->time_stamp());
   EXPECT_EQ(38, ev1->x());
   EXPECT_EQ(102, ev1->y());
-  EXPECT_EQ(686, ev1->touch_id());
+  EXPECT_EQ(1, ev1->touch_id());
   EXPECT_FLOAT_EQ(.5f, ev1->force());
   EXPECT_FLOAT_EQ(0.f, ev1->rotation_angle());
 }
 
 TEST_F(TouchEventConverterEvdevTest, TypeA) {
   ui::MockTouchEventConverterEvdev* dev = device();
 
   struct input_event mock_kernel_queue_press0[] = {
     {{0, 0}, EV_ABS, ABS_MT_TOUCH_MAJOR, 3},
     {{0, 0}, EV_ABS, ABS_MT_PRESSURE, 45},
@@ skipping 76 matching lines @@
   dev->ReadNow();
 
   const unsigned int kExpectedEventCount = 2;
   EXPECT_EQ(kExpectedEventCount, dev->size());
   if (kExpectedEventCount != dev->size())
     return;
 
   ui::TouchEvent* ev0 = dev->event(0);
   ui::TouchEvent* ev1 = dev->event(1);
 
-  EXPECT_EQ(100, ev0->touch_id());
+  EXPECT_EQ(0, ev0->touch_id());
   EXPECT_EQ(999, ev0->x());
   EXPECT_EQ(888, ev0->y());
   EXPECT_FLOAT_EQ(0.8333333f, ev0->force());
 
-  EXPECT_EQ(200, ev1->touch_id());
+  EXPECT_EQ(1, ev1->touch_id());
   EXPECT_EQ(777, ev1->x());
   EXPECT_EQ(666, ev1->y());
   EXPECT_FLOAT_EQ(0.4666666f, ev1->force());
 }