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

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

Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
Index: ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
index 09db14966b335343d560f4960c3d4c00f5635099..533c3b8f0f638cf4713dc9685d2a4ea6b42d57a2 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
@@ -120,13 +120,13 @@ class EventConverterEvdevImplTest : public testing::Test {
unsigned size() { return dispatched_events_.size(); }
ui::KeyEvent* dispatched_event(unsigned index) {
DCHECK_GT(dispatched_events_.size(), index);
- ui::Event* ev = dispatched_events_[index];
+ ui::Event* ev = dispatched_events_[index].get();
DCHECK(ev->IsKeyEvent());
return static_cast<ui::KeyEvent*>(ev);
}
ui::MouseEvent* dispatched_mouse_event(unsigned index) {
DCHECK_GT(dispatched_events_.size(), index);
- ui::Event* ev = dispatched_events_[index];
+ ui::Event* ev = dispatched_events_[index].get();
DCHECK(ev->IsMouseEvent());
return static_cast<ui::MouseEvent*>(ev);
}
@@ -151,7 +151,7 @@ class EventConverterEvdevImplTest : public testing::Test {
scoped_ptr<ui::DeviceEventDispatcherEvdev> dispatcher_;
scoped_ptr<ui::MockEventConverterEvdevImpl> device_;
- ScopedVector<ui::Event> dispatched_events_;
+ std::vector<scoped_ptr<ui::Event>> dispatched_events_;
int events_out_;
int events_in_;

Powered by Google App Engine
This is Rietveld 408576698