[PATCH 6/11] ozone: evdev: Factor device I/O out of EventFactoryOzone

ui/events/ozone/evdev/input_controller_evdev.h

Index: ui/events/ozone/evdev/input_controller_evdev.h
diff --git a/ui/events/ozone/evdev/input_controller_evdev.h b/ui/events/ozone/evdev/input_controller_evdev.h
index 0e151acd9665582497342e1ea8206ac40f842171..cc930b6173828c58cef9909ae69dbde59f233ba7 100644
--- a/ui/events/ozone/evdev/input_controller_evdev.h
+++ b/ui/events/ozone/evdev/input_controller_evdev.h
@@ -14,7 +14,7 @@
 
 namespace ui {
 
-class EventFactoryEvdev;
+class InputDeviceFactoryEvdev;
 class KeyboardEvdev;
 class MouseButtonMapEvdev;
 
@@ -25,8 +25,7 @@ class GesturePropertyProvider;
 // Ozone InputController implementation for the Linux input subsystem ("evdev").
 class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController {
  public:
-  InputControllerEvdev(EventFactoryEvdev* event_factory,
-                       KeyboardEvdev* keyboard,
+  InputControllerEvdev(KeyboardEvdev* keyboard,
                        MouseButtonMapEvdev* button_map
 #if defined(USE_EVDEV_GESTURES)
                        ,
@@ -35,6 +34,10 @@ class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController {
                        );
   ~InputControllerEvdev() override;
 
+  // Initialize device factory. This would be in the constructor if it was
+  // built early enough for that to be possible.
+  void SetInputDeviceFactory(InputDeviceFactoryEvdev* input_device_factory);
+
   // InputController:
   bool HasMouse() override;
   bool HasTouchpad() override;
@@ -70,8 +73,8 @@ class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController {
                                  const std::string& name,
                                  bool value);
 
-  // Event factory object which manages device event converters.
-  EventFactoryEvdev* event_factory_;
+  // Factory for devices. Needed to update device config.
+  InputDeviceFactoryEvdev* input_device_factory_;
 
   // Keyboard state.
   KeyboardEvdev* keyboard_;