[PATCH 3/11] ozone: evdev: Move MouseButtonMap 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/device/device_manager.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/event_factory_evdev.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,
-                              const KeyEventDispatchCallback& key_callback,
-                              const EventDispatchCallback& callback)
+  MockEventConverterEvdevImpl(
+      int fd,
+      EventModifiersEvdev* modifiers,
+      CursorDelegateEvdev* cursor,
+      const KeyEventDispatchCallback& key_callback,
+      const MouseMoveEventDispatchCallback& mouse_move_callback,
+      const MouseButtonEventDispatchCallback& mouse_button_callback)
       : EventConverterEvdevImpl(fd,
                                 base::FilePath(kTestDevicePath),
                                 1,
                                 INPUT_DEVICE_UNKNOWN,
                                 EventDeviceInfo(),
                                 modifiers,
-                                button_map,
                                 cursor,
                                 key_callback,
-                                callback) {
+                                mouse_move_callback,
+                                mouse_button_callback) {
     Start();
   }
   ~MockEventConverterEvdevImpl() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventConverterEvdevImpl);
 };
 
 class MockCursorEvdev : public CursorDelegateEvdev {
  public:
@@ skipping 18 matching lines @@
   }
   gfx::PointF GetLocation() override { return cursor_location_; }
 
  private:
   // The location of the mock cursor.
   gfx::PointF cursor_location_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCursorEvdev);
 };
 
+class MockDeviceManager : public ui::DeviceManager {
+ public:
+  MockDeviceManager() {}
+  ~MockDeviceManager() override {}
+
+  // DeviceManager:
+  void ScanDevices(DeviceEventObserver* observer) override {}
+  void AddObserver(DeviceEventObserver* observer) override {}
+  void RemoveObserver(DeviceEventObserver* observer) override {}
+};
+
+class TestEventFactoryEvdev : public EventFactoryEvdev {
+ public:
+  TestEventFactoryEvdev(CursorDelegateEvdev* cursor,
+                        DeviceManager* device_manager,
+                        KeyboardLayoutEngine* keyboard_layout_engine,
+                        const EventDispatchCallback& callback)
+      : EventFactoryEvdev(cursor, device_manager, keyboard_layout_engine),
+        callback_(callback) {}
+  ~TestEventFactoryEvdev() override {}
+
+ private:
+  void PostUiEvent(scoped_ptr<Event> event) override {
+    callback_.Run(event.Pass());
+  }
+
+  EventDispatchCallback callback_;
+};
+
 }  // namespace ui
 
 // Test fixture.
 class EventConverterEvdevImplTest : public testing::Test {
  public:
   EventConverterEvdevImplTest() {}
 
   // Overridden from testing::Test:
   void SetUp() override {
     // Set up pipe to satisfy message pump (unused).
     int evdev_io[2];
     if (pipe(evdev_io))
       PLOG(FATAL) << "failed pipe";
     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());
+    device_manager_.reset(new ui::MockDeviceManager());
+    event_factory_.reset(new ui::TestEventFactoryEvdev(
+        cursor_.get(), device_manager_.get(),
+        ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(),
+        base::Bind(&EventConverterEvdevImplTest::DispatchEventForTest,
+                   base::Unretained(this))));
 
-    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(),
-        key_callback, callback));
+        events_in_, event_factory_->modifiers(), cursor_.get(),
+        base::Bind(&ui::EventFactoryEvdev::PostKeyEvent,
+                   base::Unretained(event_factory_.get())),
+        base::Bind(&ui::EventFactoryEvdev::PostMouseMoveEvent,
+                   base::Unretained(event_factory_.get())),
+        base::Bind(&ui::EventFactoryEvdev::PostMouseButtonEvent,
+                   base::Unretained(event_factory_.get()))));
   }
   void TearDown() override {
     device_.reset();
-    keyboard_.reset();
-    modifiers_.reset();
-    button_map_.reset();
     cursor_.reset();
     close(events_in_);
     close(events_out_);
   }
 
   ui::MockCursorEvdev* cursor() { return cursor_.get(); }
   ui::MockEventConverterEvdevImpl* device() { return device_.get(); }
-  ui::EventModifiersEvdev* modifiers() { return modifiers_.get(); }
-  ui::MouseButtonMapEvdev* button_map() { return button_map_.get(); }
 
   unsigned size() { return dispatched_events_.size(); }
   ui::KeyEvent* dispatched_event(unsigned index) {
     DCHECK_GT(dispatched_events_.size(), index);
     ui::Event* ev = dispatched_events_[index];
     DCHECK(ev->IsKeyEvent());
     return static_cast<ui::KeyEvent*>(ev);
   }
   ui::MouseEvent* dispatched_mouse_event(unsigned index) {
     DCHECK_GT(dispatched_events_.size(), index);
     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::DeviceManager> device_manager_;
+  scoped_ptr<ui::EventFactoryEvdev> event_factory_;
   scoped_ptr<ui::MockEventConverterEvdevImpl> device_;
 
   ScopedVector<ui::Event> dispatched_events_;
 
   int events_out_;
   int events_in_;
 
   DISALLOW_COPY_AND_ASSIGN(EventConverterEvdevImplTest);
 };
 
@@ skipping 297 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());
 }