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

ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc

 // Copyright 2014 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 <linux/input.h>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
 #include "ui/events/ozone/evdev/event_converter_evdev_impl.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
 #include "ui/events/ozone/evdev/mouse_button_map_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 
 namespace ui {
 
 const char kTestDevicePath[] = "/dev/input/test-device";
 
 class MockEventConverterEvdevImpl : public EventConverterEvdevImpl {
  public:
   MockEventConverterEvdevImpl(int fd,
                               EventModifiersEvdev* modifiers,
                               MouseButtonMapEvdev* button_map,
                               CursorDelegateEvdev* cursor,
-                              KeyboardEvdev* keyboard,
+                              const KeyEventDispatchCallback& key_callback,
                               const EventDispatchCallback& callback)
       : EventConverterEvdevImpl(fd,
                                 base::FilePath(kTestDevicePath),
                                 1,
                                 INPUT_DEVICE_UNKNOWN,
                                 EventDeviceInfo(),
                                 modifiers,
                                 button_map,
                                 cursor,
-                                keyboard,
+                                key_callback,
                                 callback) {
     Start();
   }
   ~MockEventConverterEvdevImpl() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventConverterEvdevImpl);
 };
 
 class MockCursorEvdev : public CursorDelegateEvdev {
@@ skipping 42 matching lines @@
     events_in_ = evdev_io[0];
     events_out_ = evdev_io[1];
 
     cursor_.reset(new ui::MockCursorEvdev());
     modifiers_.reset(new ui::EventModifiersEvdev());
     button_map_.reset(new ui::MouseButtonMapEvdev());
 
     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();
     keyboard_.reset();
     modifiers_.reset();
     button_map_.reset();
     cursor_.reset();
     close(events_in_);
     close(events_out_);
   }
@@ skipping 15 matching lines @@
     ui::Event* ev = dispatched_events_[index];
     DCHECK(ev->IsMouseEvent());
     return static_cast<ui::MouseEvent*>(ev);
   }
 
  private:
   void DispatchEventForTest(scoped_ptr<ui::Event> event) {
     dispatched_events_.push_back(event.release());
   }
 
+  void DispatchKeyEventForTest(const ui::KeyEventParams& params) {
+    keyboard_->OnKeyChange(params.code, params.down);
+  }
+
   base::MessageLoopForUI ui_loop_;
 
   scoped_ptr<ui::MockCursorEvdev> cursor_;
   scoped_ptr<ui::EventModifiersEvdev> modifiers_;
   scoped_ptr<ui::MouseButtonMapEvdev> button_map_;
   scoped_ptr<ui::KeyboardEvdev> keyboard_;
   scoped_ptr<ui::MockEventConverterEvdevImpl> device_;
 
   ScopedVector<ui::Event> dispatched_events_;
 
@@ skipping 303 matching lines @@
       {{0, 0}, EV_KEY, BTN_TOUCH, 1},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
 
       {{0, 0}, EV_KEY, BTN_TOUCH, 0},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
 
   dev->ProcessEvents(mock_kernel_queue, arraysize(mock_kernel_queue));
   EXPECT_EQ(0u, size());
 }