| Index: ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
|
| diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
|
| index e2bc3a4d7010735a797ac362f8d1683b98b9cc4e..255409f9c35f3f5f1cdde72212ce9149550704d8 100644
|
| --- a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
|
| +++ b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
|
| @@ -53,6 +53,7 @@ class MockTouchEventConverterEvdev : public TouchEventConverterEvdev {
|
| public:
|
| MockTouchEventConverterEvdev(int fd,
|
| base::FilePath path,
|
| + const EventDeviceInfo& devinfo,
|
| DeviceEventDispatcherEvdev* dispatcher);
|
| ~MockTouchEventConverterEvdev() override {}
|
|
|
| @@ -111,8 +112,14 @@ class MockDeviceEventDispatcherEvdev : public DeviceEventDispatcherEvdev {
|
| MockTouchEventConverterEvdev::MockTouchEventConverterEvdev(
|
| int fd,
|
| base::FilePath path,
|
| + const EventDeviceInfo& devinfo,
|
| DeviceEventDispatcherEvdev* dispatcher)
|
| - : TouchEventConverterEvdev(fd, path, 1, INPUT_DEVICE_UNKNOWN, dispatcher) {
|
| + : TouchEventConverterEvdev(fd,
|
| + path,
|
| + 1,
|
| + INPUT_DEVICE_UNKNOWN,
|
| + devinfo,
|
| + dispatcher) {
|
| int fds[2];
|
|
|
| if (pipe(fds))
|
| @@ -157,11 +164,13 @@ class TouchEventConverterEvdevTest : public testing::Test {
|
| // Device creation happens on a worker thread since it may involve blocking
|
| // operations. Simulate that by creating it before creating a UI message
|
| // loop.
|
| + EventDeviceInfo devinfo;
|
| dispatcher_.reset(new ui::MockDeviceEventDispatcherEvdev(
|
| base::Bind(&TouchEventConverterEvdevTest::DispatchCallback,
|
| base::Unretained(this))));
|
| device_ = new ui::MockTouchEventConverterEvdev(
|
| - events_in_, base::FilePath(kTestDevicePath), dispatcher_.get());
|
| + events_in_, base::FilePath(kTestDevicePath), devinfo,
|
| + dispatcher_.get());
|
| loop_ = new base::MessageLoopForUI;
|
|
|
| ui::DeviceDataManager::CreateInstance();
|
| @@ -180,9 +189,7 @@ class TouchEventConverterEvdevTest : public testing::Test {
|
| return dispatched_events_[index];
|
| }
|
|
|
| - void ClearDispatchedEvents() {
|
| - dispatched_events_.clear();
|
| - }
|
| + void ClearDispatchedEvents() { dispatched_events_.clear(); }
|
|
|
| private:
|
| base::MessageLoop* loop_;
|
|
|