Merge "Fix double-close in EventConverterEvdevImpl"

ui/events/ozone/evdev/touch_event_converter_evdev.h

Index: ui/events/ozone/evdev/touch_event_converter_evdev.h
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev.h b/ui/events/ozone/evdev/touch_event_converter_evdev.h
index 4764f231ed6db43f53b5449d879fbf866436dee8..bf6444555d9f2ad1d00e038ecb2e8b7271d741a0 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev.h
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev.h
@@ -19,6 +19,7 @@
 #include "ui/events/ozone/evdev/event_converter_evdev.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h"
+#include "ui/events/ozone/evdev/scoped_input_device.h"
 #include "ui/events/ozone/evdev/touch_evdev_debug_buffer.h"
 
 namespace ui {
@@ -30,7 +31,7 @@ struct InProgressTouchEvdev;
 class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
     : public EventConverterEvdev {
  public:
-  TouchEventConverterEvdev(int fd,
+  TouchEventConverterEvdev(ScopedInputDevice fd,
                            base::FilePath path,
                            int id,
                            const EventDeviceInfo& devinfo,
@@ -89,6 +90,9 @@ class EVENTS_OZONE_EVDEV_EXPORT TouchEventConverterEvdev
 
   int NextTrackingId();
 
+  // Input device file descriptor.
+  ScopedInputDevice input_device_fd_;
+
   // Dispatcher for events.
   DeviceEventDispatcherEvdev* dispatcher_;