[PATCH 9/11] ozone: evdev: Add a device event dispatcher that forwards to UI thread

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_converter_test_util.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_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:
@@ skipping 38 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());
-    device_manager_.reset(new ui::MockDeviceManager());
-    event_factory_.reset(new ui::TestEventFactoryEvdev(
+
+    device_manager_ = ui::CreateDeviceManagerForTest();
+    event_factory_ = ui::CreateEventFactoryEvdevForTest(
         cursor_.get(), device_manager_.get(),
         ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(),
         base::Bind(&EventConverterEvdevImplTest::DispatchEventForTest,
-                   base::Unretained(this))));
+                   base::Unretained(this)));
+    dispatcher_ =
+        ui::CreateDeviceEventDispatcherEvdevForTest(event_factory_.get());
+    device_.reset(new ui::MockEventConverterEvdevImpl(events_in_, cursor_.get(),
+                                                      dispatcher_.get()));
+  }
 
-    device_.reset(new ui::MockEventConverterEvdevImpl(events_in_, cursor_.get(),
-                                                      event_factory_.get()));
-  }
   void TearDown() override {
     device_.reset();
     cursor_.reset();
     close(events_in_);
     close(events_out_);
   }
 
   ui::MockCursorEvdev* cursor() { return cursor_.get(); }
   ui::MockEventConverterEvdevImpl* device() { return device_.get(); }
 
@@ skipping 14 matching lines @@
  private:
   void DispatchEventForTest(scoped_ptr<ui::Event> event) {
     dispatched_events_.push_back(event.release());
   }
 
   base::MessageLoopForUI ui_loop_;
 
   scoped_ptr<ui::MockCursorEvdev> cursor_;
   scoped_ptr<ui::DeviceManager> device_manager_;
   scoped_ptr<ui::EventFactoryEvdev> event_factory_;
+  scoped_ptr<ui::DeviceEventDispatcherEvdev> dispatcher_;
   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());
 }