Remove ui::GetTouchId which is used only in tests.

Bug: 687724
Change-Id: Ib4f2d12d0e6a40b482dddafe0346f9852df6e7ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2004504Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Mustaq Ahmed <mustaq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732929}

ui/events/cocoa/events_mac.mm

@@ -163,11 +163,6 @@ void ClearTouchIdIfReleased(const PlatformEvent& native_event) {
   NOTIMPLEMENTED();
 }
 
-int GetTouchId(const PlatformEvent& native_event) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
 PointerDetails GetTouchPointerDetailsFromNative(
     const PlatformEvent& native_event) {
   NOTIMPLEMENTED();

ui/events/event.cc

@@ -756,9 +756,9 @@ TouchEvent::TouchEvent(const TouchEvent& copy)
 
 TouchEvent::~TouchEvent() {
 #if defined(USE_X11)
-  // In ctor TouchEvent(native_event) we call GetTouchId() which in X11
-  // platform setups the tracking_id to slot mapping. So in dtor here,
-  // if this touch event is a release event, we clear the mapping accordingly.
+  // In ctor TouchEvent(native_event) we call GetTouchIdFromXEvent() which
+  // setups the tracking_id to slot mapping. So in dtor here, if this touch
+  // event is a release event, we clear the mapping accordingly.
   if (type() == ET_TOUCH_RELEASED || type() == ET_TOUCH_CANCELLED)
     TouchFactory::GetInstance()->ReleaseSlot(pointer_details().id);
 #endif

ui/events/event_utils.h

@@ -134,9 +134,6 @@ void ReleaseCopiedNativeEvent(const PlatformEvent& native_event);
 EVENTS_EXPORT PointerDetails
 GetTouchPointerDetailsFromNative(const PlatformEvent& native_event);
 
-// Gets the touch id from a native event.
-EVENTS_EXPORT int GetTouchId(const PlatformEvent& native_event);
-
 // Gets the fling velocity from a native event. is_cancel is set to true if
 // this was a tap down, intended to stop an ongoing fling.
 EVENTS_EXPORT bool GetFlingData(const PlatformEvent& native_event,

ui/events/events_default.cc

@@ -87,14 +87,6 @@ PlatformEvent CopyNativeEvent(const PlatformEvent& event) {
 
 void ReleaseCopiedNativeEvent(const PlatformEvent& event) {}
 
-// TODO(687724): Will remove all GetTouchId functions.
-int GetTouchId(const PlatformEvent& native_event) {
-  const ui::TouchEvent* event =
-      static_cast<const ui::TouchEvent*>(native_event);
-  DCHECK(event->IsTouchEvent());
-  return event->pointer_details().id;
-}
-
 PointerDetails GetTouchPointerDetailsFromNative(
     const PlatformEvent& native_event) {
   const ui::TouchEvent* event =

ui/events/events_stub.cc

@@ -69,11 +69,6 @@ PlatformEvent CopyNativeEvent(const PlatformEvent& event) {
 
 void ReleaseCopiedNativeEvent(const PlatformEvent& event) {}
 
-int GetTouchId(const PlatformEvent& native_event) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
 PointerDetails GetTouchPointerDetailsFromNative(
     const PlatformEvent& native_event) {
   NOTIMPLEMENTED();

ui/events/win/events_win.cc

@@ -57,11 +57,6 @@ MSG CopyNativeEvent(const MSG& event) {
 
 void ReleaseCopiedNativeEvent(const MSG& event) {}
 
-int GetTouchId(const MSG& xev) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
 PointerDetails GetTouchPointerDetailsFromNative(const MSG& native_event) {
   NOTIMPLEMENTED();
   return PointerDetails(EventPointerType::POINTER_TYPE_TOUCH,

ui/events/win/events_win_utils.h

@@ -85,9 +85,6 @@ void ReleaseCopiedMSGEvent(const MSG& native_event);
 // Returns the detailed pointer information for touch events.
 PointerDetails GetTouchPointerDetailsFromMSG(const MSG& native_event);
 
-// Gets the touch id from a native event.
-int GetTouchId(const MSG& native_event);
-
 // Clear the touch id from bookkeeping if it is a release/cancel event.
 void ClearTouchIdIfReleased(const MSG& native_event);
 

ui/events/x/events_x.cc

@@ -89,10 +89,6 @@ void ReleaseCopiedNativeEvent(const PlatformEvent& native_event) {
   delete native_event;
 }
 
-int GetTouchId(const PlatformEvent& native_event) {
-  return GetTouchIdFromXEvent(*native_event);
-}
-
 PointerDetails GetTouchPointerDetailsFromNative(
     const PlatformEvent& native_event) {
   return GetTouchPointerDetailsFromXEvent(*native_event);

ui/events/x/events_x_unittest.cc

@@ -254,7 +254,7 @@ TEST_F(EventsXTest, TouchEventBasic) {
   EXPECT_EQ("10,10",
             gfx::ToFlooredPoint(ui::EventLocationFromNative(scoped_xevent))
                 .ToString());
-  EXPECT_EQ(GetTouchId(scoped_xevent), 0);
+  EXPECT_EQ(GetTouchIdFromXEvent(*scoped_xevent), 0);
   PointerDetails pointer_details =
       GetTouchPointerDetailsFromNative(scoped_xevent);
   EXPECT_FLOAT_EQ(ComputeRotationAngle(pointer_details.twist), 0.15f);
@@ -271,7 +271,7 @@ TEST_F(EventsXTest, TouchEventBasic) {
   EXPECT_EQ("20,20",
             gfx::ToFlooredPoint(ui::EventLocationFromNative(scoped_xevent))
                 .ToString());
-  EXPECT_EQ(GetTouchId(scoped_xevent), 0);
+  EXPECT_EQ(GetTouchIdFromXEvent(*scoped_xevent), 0);
   pointer_details = GetTouchPointerDetailsFromNative(scoped_xevent);
   EXPECT_FLOAT_EQ(ComputeRotationAngle(pointer_details.twist), 0.25f);
   EXPECT_FLOAT_EQ(pointer_details.radius_x, 10.0f);
@@ -289,7 +289,7 @@ TEST_F(EventsXTest, TouchEventBasic) {
   EXPECT_EQ("200,200",
             gfx::ToFlooredPoint(ui::EventLocationFromNative(scoped_xevent))
                 .ToString());
-  EXPECT_EQ(GetTouchId(scoped_xevent), 1);
+  EXPECT_EQ(GetTouchIdFromXEvent(*scoped_xevent), 1);
   pointer_details = GetTouchPointerDetailsFromNative(scoped_xevent);
   EXPECT_FLOAT_EQ(ComputeRotationAngle(pointer_details.twist), 0.45f);
   EXPECT_FLOAT_EQ(pointer_details.radius_x, 50.0f);
@@ -305,7 +305,7 @@ TEST_F(EventsXTest, TouchEventBasic) {
   EXPECT_EQ("30,30",
             gfx::ToFlooredPoint(ui::EventLocationFromNative(scoped_xevent))
                 .ToString());
-  EXPECT_EQ(GetTouchId(scoped_xevent), 0);
+  EXPECT_EQ(GetTouchIdFromXEvent(*scoped_xevent), 0);
   pointer_details = GetTouchPointerDetailsFromNative(scoped_xevent);
   EXPECT_FLOAT_EQ(ComputeRotationAngle(pointer_details.twist), 0.25f);
   EXPECT_FLOAT_EQ(pointer_details.radius_x, 10.0f);
@@ -321,7 +321,7 @@ TEST_F(EventsXTest, TouchEventBasic) {
   EXPECT_EQ("200,200",
             gfx::ToFlooredPoint(ui::EventLocationFromNative(scoped_xevent))
                 .ToString());
-  EXPECT_EQ(GetTouchId(scoped_xevent), 1);
+  EXPECT_EQ(GetTouchIdFromXEvent(*scoped_xevent), 1);
   pointer_details = GetTouchPointerDetailsFromNative(scoped_xevent);
   EXPECT_FLOAT_EQ(ComputeRotationAngle(pointer_details.twist), 0.45f);
   EXPECT_FLOAT_EQ(pointer_details.radius_x, 25.0f);