[PATCH 2/11] ozone: evdev: Move KeyboardEvdev usage during dispatch to EventFactoryEvdev

ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc

Index: ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
index f7f05ec5bef126aab1cb67cb3d06dd445aa789e9..ba82889a27c9b5f49344835e1edf968325be2a3c 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
@@ -27,7 +27,7 @@ class MockEventConverterEvdevImpl : public EventConverterEvdevImpl {
                               EventModifiersEvdev* modifiers,
                               MouseButtonMapEvdev* button_map,
                               CursorDelegateEvdev* cursor,
-                              KeyboardEvdev* keyboard,
+                              const KeyEventDispatchCallback& key_callback,
                               const EventDispatchCallback& callback)
       : EventConverterEvdevImpl(fd,
                                 base::FilePath(kTestDevicePath),
@@ -37,7 +37,7 @@ class MockEventConverterEvdevImpl : public EventConverterEvdevImpl {
                                 modifiers,
                                 button_map,
                                 cursor,
-                                keyboard,
+                                key_callback,
                                 callback) {
     Start();
   }
@@ -100,12 +100,15 @@ class EventConverterEvdevImplTest : public testing::Test {
     const ui::EventDispatchCallback callback =
         base::Bind(&EventConverterEvdevImplTest::DispatchEventForTest,
                    base::Unretained(this));
+    const ui::KeyEventDispatchCallback key_callback =
+        base::Bind(&EventConverterEvdevImplTest::DispatchKeyEventForTest,
+                   base::Unretained(this));
     keyboard_.reset(new ui::KeyboardEvdev(
         modifiers_.get(),
         ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(), callback));
     device_.reset(new ui::MockEventConverterEvdevImpl(
         events_in_, modifiers_.get(), button_map_.get(), cursor_.get(),
-        keyboard_.get(), callback));
+        key_callback, callback));
   }
   void TearDown() override {
     device_.reset();
@@ -141,6 +144,10 @@ class EventConverterEvdevImplTest : public testing::Test {
     dispatched_events_.push_back(event.release());
   }
 
+  void DispatchKeyEventForTest(int device_id, unsigned int code, bool down) {
+    keyboard_->OnKeyChange(code, down);
+  }
+
   base::MessageLoopForUI ui_loop_;
 
   scoped_ptr<ui::MockCursorEvdev> cursor_;