[PATCH 9.2/11] ozone: evdev: Use DeviceEventDispatcherEvdev from InputInjectorEvdev

ui/events/ozone/evdev/input_injector_evdev_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 "ui/events/ozone/evdev/input_injector_evdev.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/ozone/device/device_manager.h"
 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
-#include "ui/events/ozone/evdev/event_modifiers_evdev.h"
-#include "ui/events/ozone/evdev/keyboard_evdev.h"
+#include "ui/events/ozone/evdev/event_converter_test_util.h"
+#include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/events_ozone.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 
 namespace ui {
 
 using testing::AllOf;
 using testing::InSequence;
 using testing::Property;
 
 class EventObserver {
@@ skipping 77 matching lines @@
 
 class InputInjectorEvdevTest : public testing::Test {
  public:
   InputInjectorEvdevTest();
 
  protected:
   void SimulateMouseClick(int x, int y, EventFlags button, int count);
   void ExpectClick(int x, int y, int button, int count);
 
   EventObserver event_observer_;
-  EventModifiersEvdev modifiers_;
   EventDispatchCallback dispatch_callback_;
   MockCursorEvdev cursor_;
-  KeyboardEvdev keyboard_;
+
+  scoped_ptr<DeviceManager> device_manager_;
+  scoped_ptr<EventFactoryEvdev> event_factory_;
 
   InputInjectorEvdev injector_;
 
   base::MessageLoop message_loop_;
   base::RunLoop run_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InputInjectorEvdevTest);
 };
 
 InputInjectorEvdevTest::InputInjectorEvdevTest()
     : dispatch_callback_(base::Bind(&EventObserver::EventDispatchCallback,
                                     base::Unretained(&event_observer_))),
-      keyboard_(&modifiers_,
-                KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(),
-                dispatch_callback_),
-      injector_(&modifiers_, &cursor_, &keyboard_, dispatch_callback_) {
+      device_manager_(CreateDeviceManagerForTest()),
+      event_factory_(CreateEventFactoryEvdevForTest(
+          &cursor_,
+          device_manager_.get(),
+          ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(),
+          dispatch_callback_)),
+      injector_(CreateDeviceEventDispatcherEvdevForTest(event_factory_.get()),
+                &cursor_) {
 }
 
 void InputInjectorEvdevTest::SimulateMouseClick(int x,
                                                 int y,
                                                 EventFlags button,
                                                 int count) {
   injector_.MoveCursorTo(gfx::PointF(x, y));
   for (int i = 0; i < count; i++) {
     injector_.InjectMouseButton(button, true);
     injector_.InjectMouseButton(button, false);
@@ skipping 68 matching lines @@
                                    MatchesMouseEvent(ET_MOUSEWHEEL, 0, 10, 20),
                                    Property(&MouseWheelEvent::x_offset, 100),
                                    Property(&MouseWheelEvent::y_offset, 0))));
   injector_.MoveCursorTo(gfx::PointF(10, 20));
   injector_.InjectMouseWheel(0, 100);
   injector_.InjectMouseWheel(100, 0);
   run_loop_.RunUntilIdle();
 }
 
 }  // namespace ui