OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/events/ozone/evdev/event_converter_test_util.h" | 5 #include "ui/events/ozone/evdev/event_converter_test_util.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "ui/events/ozone/device/device_manager.h" | 10 #include "ui/events/ozone/device/device_manager.h" |
10 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h" | 11 #include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h" |
11 #include "ui/events/ozone/evdev/event_factory_evdev.h" | 12 #include "ui/events/ozone/evdev/event_factory_evdev.h" |
12 #include "ui/events/platform/platform_event_dispatcher.h" | 13 #include "ui/events/platform/platform_event_dispatcher.h" |
13 | 14 |
14 namespace ui { | 15 namespace ui { |
15 | 16 |
16 namespace { | 17 namespace { |
17 | 18 |
18 class TestDeviceManager : public ui::DeviceManager { | 19 class TestDeviceManager : public ui::DeviceManager { |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 Event* event = static_cast<Event*>(platform_event); | 101 Event* event = static_cast<Event*>(platform_event); |
101 callback_.Run(event); | 102 callback_.Run(event); |
102 return POST_DISPATCH_NONE; | 103 return POST_DISPATCH_NONE; |
103 } | 104 } |
104 | 105 |
105 EventDispatchCallback callback_; | 106 EventDispatchCallback callback_; |
106 }; | 107 }; |
107 | 108 |
108 } // namespace | 109 } // namespace |
109 | 110 |
110 scoped_ptr<DeviceEventDispatcherEvdev> CreateDeviceEventDispatcherEvdevForTest( | 111 std::unique_ptr<DeviceEventDispatcherEvdev> |
111 EventFactoryEvdev* event_factory) { | 112 CreateDeviceEventDispatcherEvdevForTest(EventFactoryEvdev* event_factory) { |
112 return make_scoped_ptr(new TestDeviceEventDispatcherEvdev(event_factory)); | 113 return base::WrapUnique(new TestDeviceEventDispatcherEvdev(event_factory)); |
113 } | 114 } |
114 | 115 |
115 scoped_ptr<DeviceManager> CreateDeviceManagerForTest() { | 116 std::unique_ptr<DeviceManager> CreateDeviceManagerForTest() { |
116 return make_scoped_ptr(new TestDeviceManager()); | 117 return base::WrapUnique(new TestDeviceManager()); |
117 } | 118 } |
118 | 119 |
119 scoped_ptr<EventFactoryEvdev> CreateEventFactoryEvdevForTest( | 120 std::unique_ptr<EventFactoryEvdev> CreateEventFactoryEvdevForTest( |
120 CursorDelegateEvdev* cursor, | 121 CursorDelegateEvdev* cursor, |
121 DeviceManager* device_manager, | 122 DeviceManager* device_manager, |
122 KeyboardLayoutEngine* keyboard_layout_engine, | 123 KeyboardLayoutEngine* keyboard_layout_engine, |
123 const EventDispatchCallback& callback) { | 124 const EventDispatchCallback& callback) { |
124 return make_scoped_ptr(new TestEventFactoryEvdev( | 125 return base::WrapUnique(new TestEventFactoryEvdev( |
125 cursor, device_manager, keyboard_layout_engine, callback)); | 126 cursor, device_manager, keyboard_layout_engine, callback)); |
126 } | 127 } |
127 | 128 |
128 } // namespace ui | 129 } // namespace ui |
OLD | NEW |