evdev: Move EventConverterOzone ownership from EventFactoryOzone to subclass

ui/events/ozone/evdev/event_factory.cc

Index: ui/events/ozone/evdev/event_factory.cc
diff --git a/ui/events/ozone/evdev/event_factory.cc b/ui/events/ozone/evdev/event_factory.cc
index 95f86a396e922685bb8e62582ad7cf0f13627a5a..8cd0d6371eabf7b8848b3909dc424bbf3227f1fd 100644
--- a/ui/events/ozone/evdev/event_factory.cc
+++ b/ui/events/ozone/evdev/event_factory.cc
@@ -12,6 +12,7 @@
 
 #include "base/debug/trace_event.h"
 #include "base/files/file_enumerator.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "ui/events/ozone/evdev/event_device_info.h"
@@ -39,7 +40,7 @@ bool IsTouchScreen(const EventDeviceInfo& devinfo) {
 
 EventFactoryEvdev::EventFactoryEvdev() {}
 
-EventFactoryEvdev::~EventFactoryEvdev() {}
+EventFactoryEvdev::~EventFactoryEvdev() { STLDeleteValues(&converters_); }
 
 void EventFactoryEvdev::AttachInputDevice(const base::FilePath& path) {
   TRACE_EVENT1("ozone", "AttachInputDevice", "path", path.value());
@@ -71,7 +72,7 @@ void EventFactoryEvdev::AttachInputDevice(const base::FilePath& path) {
     converter.reset(new KeyEventConverterEvdev(fd, path, &modifiers_));
 
   if (converter) {
-    AddEventConverter(fd, converter.Pass());
+    converters_[path] = converter.release();
   } else {
     close(fd);
   }