Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc

Issue 661353006: ozone: evdev: Dispatch events in task (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/keyboard_evdev.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
diff --git a/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
index fb5a90ae8ef6860cbd0016755a996ba29b98a602..f78925cd143e02e6e355874c1ef798e1fe995232 100644
--- a/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
+++ b/ui/events/ozone/evdev/key_event_converter_evdev_unittest.cc
@@ -72,13 +72,14 @@ class KeyEventConverterEvdevTest : public testing::Test {
unsigned size() { return dispatched_events_.size(); }
ui::KeyEvent* dispatched_event(unsigned index) {
DCHECK_GT(dispatched_events_.size(), index);
- return dispatched_events_[index];
+ ui::Event* ev = dispatched_events_[index];
+ DCHECK(ev->IsKeyEvent());
+ return static_cast<ui::KeyEvent*>(ev);
}
private:
- void DispatchEventForTest(ui::Event* event) {
- dispatched_events_.push_back(
- new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event)));
+ void DispatchEventForTest(scoped_ptr<ui::Event> event) {
+ dispatched_events_.push_back(event.release());
}
base::MessageLoopForUI ui_loop_;
@@ -87,7 +88,7 @@ class KeyEventConverterEvdevTest : public testing::Test {
scoped_ptr<ui::KeyboardEvdev> keyboard_;
scoped_ptr<ui::MockKeyEventConverterEvdev> device_;
- ScopedVector<ui::KeyEvent> dispatched_events_;
+ ScopedVector<ui::Event> dispatched_events_;
int events_out_;
int events_in_;
« no previous file with comments | « ui/events/ozone/evdev/event_factory_evdev.cc ('k') | ui/events/ozone/evdev/keyboard_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698