evdev: Move EventConverterOzone ownership from EventFactoryOzone to subclass

ui/events/ozone/evdev/key_event_converter.cc

 // 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.
 
 #include "ui/events/ozone/evdev/key_event_converter.h"
 
 #include <linux/input.h>
 
+#include "base/message_loop/message_pump_ozone.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/ozone/evdev/event_modifiers.h"
 
 namespace ui {
 
 namespace {
 
 ui::KeyboardCode KeyboardCodeFromButton(unsigned int code) {
   static const ui::KeyboardCode kLinuxBaseKeyMap[] = {
@@ skipping 163 matching lines @@
 
 bool IsLockButton(unsigned int code) { return code == KEY_CAPSLOCK; }
 
 }  // namespace
 
 KeyEventConverterEvdev::KeyEventConverterEvdev(int fd,
                                                base::FilePath path,
                                                EventModifiersEvdev* modifiers)
     : fd_(fd), path_(path), modifiers_(modifiers) {
   // TODO(spang): Initialize modifiers using EVIOCGKEY.
+  Start();
 }
 
 KeyEventConverterEvdev::~KeyEventConverterEvdev() {
-  if (fd_ >= 0 && close(fd_) < 0)
-    DLOG(WARNING) << "failed close on " << path_.value();
+  Stop();
+  close(fd_);
+}
+
+void KeyEventConverterEvdev::Start() {
+  base::MessagePumpOzone::Current()->WatchFileDescriptor(
+      fd_, true, base::MessagePumpLibevent::WATCH_READ, &controller_, this);
+}
+
+void KeyEventConverterEvdev::Stop() {
+  controller_.StopWatchingFileDescriptor();
 }
 
 void KeyEventConverterEvdev::OnFileCanReadWithoutBlocking(int fd) {
   input_event inputs[4];
   ssize_t read_size = read(fd, inputs, sizeof(inputs));
   if (read_size <= 0)
     return;
 
   CHECK_EQ(read_size % sizeof(*inputs), 0u);
   ProcessEvents(inputs, read_size / sizeof(*inputs));
@@ skipping 32 matching lines @@
   }
 
   int flags = modifiers_->GetModifierFlags();
 
   scoped_ptr<KeyEvent> key_event(
       new KeyEvent(down ? ET_KEY_PRESSED : ET_KEY_RELEASED, code, flags, true));
   DispatchEvent(key_event.PassAs<ui::Event>());
 }
 
 }  // namespace ui