evdev: Move EventConverterOzone ownership from EventFactoryOzone to subclass

ui/events/ozone/evdev/touch_event_converter.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
 #define UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_
 
 #include <bitset>
 
 #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"
 
 namespace ui {
 
 class TouchEvent;
 
-class EVENTS_EXPORT TouchEventConverterEvdev : public EventConverterOzone {
+class EVENTS_EXPORT TouchEventConverterEvdev
+    : public EventConverterOzone,
+      base::MessagePumpLibevent::Watcher {
  public:
   enum {
     MAX_FINGERS = 11
   };
   TouchEventConverterEvdev(int fd, base::FilePath path);
   virtual ~TouchEventConverterEvdev();
 
  private:
   friend class MockTouchEventConverterEvdev;
 
   // 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;
 
   // Pressure values.
   int pressure_min_;
   int pressure_max_;  // Used to normalize pressure values.
 
   // Touch scaling.
   float x_scale_;
@@ skipping 23 matching lines @@
     int finger_;  // "Finger" id starting from 0; -1 means not active
 
     EventType type_;
     int major_;
     float pressure_;
   };
 
   // In-progress touch points.
   InProgressEvents events_[MAX_FINGERS];
 
+  // Controller for watching the input fd.
+  base::MessagePumpLibevent::FileDescriptorWatcher controller_;
+
   DISALLOW_COPY_AND_ASSIGN(TouchEventConverterEvdev);
 };
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_OZONE_EVDEV_TOUCH_EVENT_CONVERTER_EVDEV_H_