evdev: Fix infinite loop when devices are unplugged

ui/events/ozone/evdev/event_converter.h

Index: ui/events/ozone/evdev/event_converter.h
diff --git a/ui/events/ozone/evdev/event_converter.h b/ui/events/ozone/evdev/event_converter.h
index 8aab7cdc455c3ecf6353eaf485375a3fab4a9880..4b68fb9a476fac365852cdfe90b32827f2185e03 100644
--- a/ui/events/ozone/evdev/event_converter.h
+++ b/ui/events/ozone/evdev/event_converter.h
@@ -16,7 +16,8 @@ struct input_event;
 
 namespace ui {
 
-class EVENTS_EXPORT EventConverterEvdev : public EventConverterOzone {
+class EVENTS_EXPORT EventConverterEvdev : public EventConverterOzone,
+                                          base::MessagePumpLibevent::Watcher {
  public:
   EventConverterEvdev(int fd,
                       base::FilePath path,
@@ -27,6 +28,10 @@ class EVENTS_EXPORT EventConverterEvdev : public EventConverterOzone {
   virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
   virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
 
+  // Overridden from EventConverterOzone.
+  void Start() OVERRIDE;
+  void Stop() OVERRIDE;
+
  protected:
   // Process & dispatch events read from the device.
   virtual void ProcessEvents(const struct input_event* inputs, int count) = 0;
@@ -40,6 +45,9 @@ class EVENTS_EXPORT EventConverterEvdev : public EventConverterOzone {
   // Shared modifier state.
   EventModifiersEvdev* modifiers_;
 
+  // Controller for watching the input fd.
+  base::MessagePumpLibevent::FileDescriptorWatcher controller_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(EventConverterEvdev);
 };