evdev: Move EventConverterOzone ownership from EventFactoryOzone to subclass

ui/events/ozone/evdev/touch_event_converter.h

Index: ui/events/ozone/evdev/touch_event_converter.h
diff --git a/ui/events/ozone/evdev/touch_event_converter.h b/ui/events/ozone/evdev/touch_event_converter.h
index 1d2817c657597adc6f4dd56b80b1f5903f447fa3..b18abeac72ff2187c4badc69d01bc8e6a05110cd 100644
--- a/ui/events/ozone/evdev/touch_event_converter.h
+++ b/ui/events/ozone/evdev/touch_event_converter.h
@@ -9,6 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/message_loop/message_pump_libevent.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/events_export.h"
 #include "ui/events/ozone/event_converter_ozone.h"
@@ -17,7 +18,9 @@ namespace ui {
 
 class TouchEvent;
 
-class EVENTS_EXPORT TouchEventConverterEvdev : public EventConverterOzone {
+class EVENTS_EXPORT TouchEventConverterEvdev
+    : public EventConverterOzone,
+      base::MessagePumpLibevent::Watcher {
  public:
   enum {
     MAX_FINGERS = 11
@@ -31,6 +34,10 @@ class EVENTS_EXPORT TouchEventConverterEvdev : public EventConverterOzone {
   // Unsafe part of initialization.
   void Init();
 
+  // Start & stop watching for events.
+  void Start();
+  void Stop();
+
   // Overidden from base::MessagePumpLibevent::Watcher.
   virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
   virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
@@ -74,6 +81,9 @@ class EVENTS_EXPORT TouchEventConverterEvdev : public EventConverterOzone {
   // In-progress touch points.
   InProgressEvents events_[MAX_FINGERS];
 
+  // Controller for watching the input fd.
+  base::MessagePumpLibevent::FileDescriptorWatcher controller_;
+
   DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev);
 };