Deduplicate `MockCursorEvdev` between unit tests

The copies in `EventConverterEvdevImplTest` and
`InputInjectorEvdevTest` were exact duplicates, and I'm working on a CL
that also needs it.

Also renamed it to `FakeCursorDelegateEvdev`, since it doesn't log calls
to its methods and so isn't really a mock.

No behaviour changes should be caused by this CL.

Bug: none
Test: run `EventConverterEvdevImplTest` and `InputInjectorEvdevTest`.

Change-Id: Iad54935e675bb2b253dcf6aa5c2bb0d9d9cae1be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1559207Reviewed-by: Michael Spang <spang@chromium.org>
Commit-Queue: Harry Cutts <hcutts@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652718}

ui/events/BUILD.gn

@@ -614,6 +614,7 @@ if (!is_ios) {
         "ozone/evdev/gamepad_event_converter_evdev_unittest.cc",
         "ozone/evdev/input_injector_evdev_unittest.cc",
         "ozone/evdev/tablet_event_converter_evdev_unittest.cc",
+        "ozone/evdev/testing/fake_cursor_delegate_evdev.h",
         "ozone/evdev/touch_event_converter_evdev_unittest.cc",
         "ozone/evdev/touch_filter/false_touch_finder_unittest.cc",
         "ozone/gamepad/generic_gamepad_mapping_unittest.cc",

ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc

@@ -18,10 +18,10 @@
 #include "ui/events/keycodes/dom/dom_code.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_test_util.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
 #include "ui/events/ozone/evdev/keyboard_evdev.h"
+#include "ui/events/ozone/evdev/testing/fake_cursor_delegate_evdev.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 #include "ui/events/test/scoped_event_test_tick_clock.h"
 
@@ -52,36 +52,6 @@ class MockEventConverterEvdevImpl : public EventConverterEvdevImpl {
   DISALLOW_COPY_AND_ASSIGN(MockEventConverterEvdevImpl);
 };
 
-class MockCursorEvdev : public CursorDelegateEvdev {
- public:
-  MockCursorEvdev() {}
-  ~MockCursorEvdev() override {}
-
-  // CursorDelegateEvdev:
-  void MoveCursorTo(gfx::AcceleratedWidget widget,
-                    const gfx::PointF& location) override {
-    cursor_location_ = location;
-  }
-  void MoveCursorTo(const gfx::PointF& location) override {
-    cursor_location_ = location;
-  }
-  void MoveCursor(const gfx::Vector2dF& delta) override {
-    cursor_location_ = gfx::PointF(delta.x(), delta.y());
-  }
-  bool IsCursorVisible() override { return 1; }
-  gfx::Rect GetCursorConfinedBounds() override {
-    NOTIMPLEMENTED();
-    return gfx::Rect();
-  }
-  gfx::PointF GetLocation() override { return cursor_location_; }
-  void InitializeOnEvdev() override {}
- private:
-  // The location of the mock cursor.
-  gfx::PointF cursor_location_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockCursorEvdev);
-};
-
 }  // namespace ui
 
 // Test fixture.
@@ -98,7 +68,7 @@ class EventConverterEvdevImplTest : public testing::Test {
     base::ScopedFD events_in(evdev_io[0]);
     events_out_.reset(evdev_io[1]);
 
-    cursor_.reset(new ui::MockCursorEvdev());
+    cursor_.reset(new ui::FakeCursorDelegateEvdev());
 
     device_manager_ = ui::CreateDeviceManagerForTest();
     event_factory_ = ui::CreateEventFactoryEvdevForTest(
@@ -121,7 +91,7 @@ class EventConverterEvdevImplTest : public testing::Test {
     test_clock_.reset();
   }
 
-  ui::MockCursorEvdev* cursor() { return cursor_.get(); }
+  ui::FakeCursorDelegateEvdev* cursor() { return cursor_.get(); }
   ui::MockEventConverterEvdevImpl* device() { return device_.get(); }
 
   unsigned size() { return dispatched_events_.size(); }
@@ -160,7 +130,7 @@ class EventConverterEvdevImplTest : public testing::Test {
 
   base::MessageLoopForUI ui_loop_;
 
-  std::unique_ptr<ui::MockCursorEvdev> cursor_;
+  std::unique_ptr<ui::FakeCursorDelegateEvdev> cursor_;
   std::unique_ptr<ui::DeviceManager> device_manager_;
   std::unique_ptr<ui::EventFactoryEvdev> event_factory_;
   std::unique_ptr<ui::DeviceEventDispatcherEvdev> dispatcher_;

ui/events/ozone/evdev/input_injector_evdev_unittest.cc

@@ -11,9 +11,9 @@
 #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_converter_test_util.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
+#include "ui/events/ozone/evdev/testing/fake_cursor_delegate_evdev.h"
 #include "ui/events/ozone/events_ozone.h"
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
 
@@ -45,36 +45,6 @@ class EventObserver {
   MOCK_METHOD1(OnMouseWheelEvent, void(MouseWheelEvent* event));
 };
 
-class MockCursorEvdev : public CursorDelegateEvdev {
- public:
-  MockCursorEvdev() {}
-  ~MockCursorEvdev() override {}
-
-  // CursorDelegateEvdev:
-  void MoveCursorTo(gfx::AcceleratedWidget widget,
-                    const gfx::PointF& location) override {
-    cursor_location_ = location;
-  }
-  void MoveCursorTo(const gfx::PointF& location) override {
-    cursor_location_ = location;
-  }
-  void MoveCursor(const gfx::Vector2dF& delta) override {
-    cursor_location_ = gfx::PointF(delta.x(), delta.y());
-  }
-  bool IsCursorVisible() override { return 1; }
-  gfx::Rect GetCursorConfinedBounds() override {
-    NOTIMPLEMENTED();
-    return gfx::Rect();
-  }
-  gfx::PointF GetLocation() override { return cursor_location_; }
-  void InitializeOnEvdev() override {}
- private:
-  // The location of the mock cursor.
-  gfx::PointF cursor_location_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockCursorEvdev);
-};
-
 MATCHER_P4(MatchesMouseEvent, type, button, x, y, "") {
   if (arg->type() != type) {
     *result_listener << "Expected type: " << type << " actual: " << arg->type()
@@ -111,7 +81,7 @@ class InputInjectorEvdevTest : public testing::Test {
 
   EventObserver event_observer_;
   EventDispatchCallback dispatch_callback_;
-  MockCursorEvdev cursor_;
+  FakeCursorDelegateEvdev cursor_;
 
   std::unique_ptr<DeviceManager> device_manager_;
   std::unique_ptr<EventFactoryEvdev> event_factory_;

ui/events/ozone/evdev/testing/fake_cursor_delegate_evdev.h

+// Copyright (c) 2019 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.
+
+#ifndef UI_EVENTS_OZONE_EVDEV_TESTING_FAKE_CURSOR_DELEGATE_EVDEV_H_
+#define UI_EVENTS_OZONE_EVDEV_TESTING_FAKE_CURSOR_DELEGATE_EVDEV_H_
+
+#include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
+
+namespace ui {
+
+class FakeCursorDelegateEvdev : public CursorDelegateEvdev {
+ public:
+  FakeCursorDelegateEvdev() {}
+  ~FakeCursorDelegateEvdev() override {}
+
+  // CursorDelegateEvdev:
+  void MoveCursorTo(gfx::AcceleratedWidget widget,
+                    const gfx::PointF& location) override {
+    cursor_location_ = location;
+  }
+  void MoveCursorTo(const gfx::PointF& location) override {
+    cursor_location_ = location;
+  }
+  void MoveCursor(const gfx::Vector2dF& delta) override {
+    cursor_location_ = gfx::PointF(delta.x(), delta.y());
+  }
+  bool IsCursorVisible() override { return 1; }
+  gfx::Rect GetCursorConfinedBounds() override {
+    NOTIMPLEMENTED();
+    return gfx::Rect();
+  }
+  gfx::PointF GetLocation() override { return cursor_location_; }
+  void InitializeOnEvdev() override {}
+
+ private:
+  // The location of the mock cursor.
+  gfx::PointF cursor_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeCursorDelegateEvdev);
+};
+
+}  // namespace ui
+
+#endif  // UI_EVENTS_OZONE_EVDEV_TESTING_FAKE_CURSOR_DELEGATE_EVDEV_H_