[PATCH 5/11] ozone: evdev: Replace dispatch callbacks with an interface

ui/events/ozone/evdev/tablet_event_converter_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 <errno.h>
 #include <fcntl.h>
 #include <linux/input.h>
 #include <unistd.h>
 
 #include <vector>
@@ skipping 23 matching lines @@
 }
 
 const char kTestDevicePath[] = "/dev/input/test-device";
 
 }  // namespace
 
 namespace ui {
 
 class MockTabletEventConverterEvdev : public TabletEventConverterEvdev {
  public:
-  MockTabletEventConverterEvdev(
-      int fd,
-      base::FilePath path,
-      CursorDelegateEvdev* cursor,
-      const MouseMoveEventDispatchCallback& mouse_move_callback,
-      const MouseButtonEventDispatchCallback& mouse_button_callback);
+  MockTabletEventConverterEvdev(int fd,
+                                base::FilePath path,
+                                CursorDelegateEvdev* cursor,
+                                DeviceEventDispatcherEvdev* dispatcher);
   ~MockTabletEventConverterEvdev() override {};
 
   void ConfigureReadMock(struct input_event* queue,
                          long read_this_many,
                          long queue_index);
 
   // Actually dispatch the event reader code.
   void ReadNow() {
     OnFileCanReadWithoutBlocking(read_pipe_);
     base::RunLoop().RunUntilIdle();
@@ skipping 29 matching lines @@
  private:
   gfx::PointF cursor_location_;
   gfx::Rect cursor_display_bounds_;
   DISALLOW_COPY_AND_ASSIGN(MockTabletCursorEvdev);
 };
 
 MockTabletEventConverterEvdev::MockTabletEventConverterEvdev(
     int fd,
     base::FilePath path,
     CursorDelegateEvdev* cursor,
-    const MouseMoveEventDispatchCallback& mouse_move_callback,
-    const MouseButtonEventDispatchCallback& mouse_button_callback)
+    DeviceEventDispatcherEvdev* dispatcher)
     : TabletEventConverterEvdev(fd,
                                 path,
                                 1,
                                 INPUT_DEVICE_UNKNOWN,
                                 cursor,
                                 EventDeviceInfo(),
-                                mouse_move_callback,
-                                mouse_button_callback) {
+                                dispatcher) {
   // Real values taken from Wacom Intuos 4
   x_abs_min_ = 0;
   x_abs_range_ = 65024;
   y_abs_min_ = 0;
   y_abs_range_ = 40640;
 
   int fds[2];
 
   if (pipe(fds))
     PLOG(FATAL) << "failed pipe";
@@ skipping 63 matching lines @@
 
     cursor_.reset(new ui::MockTabletCursorEvdev());
     device_manager_.reset(new ui::MockDeviceManager);
     event_factory_.reset(new ui::TestEventFactoryEvdev(
         cursor_.get(), device_manager_.get(),
         ui::KeyboardLayoutEngineManager::GetKeyboardLayoutEngine(),
         base::Bind(&TabletEventConverterEvdevTest::DispatchEventForTest,
                    base::Unretained(this))));
     device_.reset(new ui::MockTabletEventConverterEvdev(
         events_in_, base::FilePath(kTestDevicePath), cursor_.get(),
-        base::Bind(&ui::EventFactoryEvdev::PostMouseMoveEvent,
-                   base::Unretained(event_factory_.get())),
-        base::Bind(&ui::EventFactoryEvdev::PostMouseButtonEvent,
-                   base::Unretained(event_factory_.get()))));
+        event_factory_.get()));
   }
 
   void TearDown() override {
     cursor_.reset();
     device_.reset();
   }
 
   ui::MockTabletEventConverterEvdev* device() { return device_.get(); }
   ui::CursorDelegateEvdev* cursor() { return cursor_.get(); }
 
@@ skipping 264 matching lines @@
 
   struct input_event mock_kernel_queue[] = {
       {{0, 0}, EV_ABS, ABS_X, 0},
       {{0, 0}, EV_ABS, ABS_Y, 0},
       {{0, 0}, EV_SYN, SYN_REPORT, 0},
   };
 
   dev->ProcessEvents(mock_kernel_queue, arraysize(mock_kernel_queue));
   EXPECT_EQ(0u, size());
 }