ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc - Issue 1438343002: Remove deprecated ScopedVector usage from ui/ozone and ui/events/ozone

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/events/ozone/evdev/tablet_event_converter_evdev_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: remove HDCI stuff 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

« no previous file with comments | « ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.cc ('k') | ui/ozone/common/native_display_delegate_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc

diff --git a/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc

index d898f5d4154c5b9dbecb48358c0265d4f8978783..c32a87de7988288ca6f5e68dbd088efad7b462db 100644

--- a/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc

+++ b/ui/events/ozone/evdev/tablet_event_converter_evdev_unittest.cc

@@ -101,7 +101,7 @@ class MockTabletEventConverterEvdev : public TabletEventConverterEvdev {

int read_pipe_;

int write_pipe_;

- ScopedVector<Event> dispatched_events_;

+ std::vector<scoped_ptr<Event>> dispatched_events_;

DISALLOW_COPY_AND_ASSIGN(MockTabletEventConverterEvdev);

};

@@ -211,7 +211,7 @@ class TabletEventConverterEvdevTest : public testing::Test {

unsigned size() { return dispatched_events_.size(); }

ui::MouseEvent* 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->IsMouseEvent());

return static_cast<ui::MouseEvent*>(ev);

}

@@ -227,7 +227,7 @@ class TabletEventConverterEvdevTest : public testing::Test {

scoped_ptr<ui::EventFactoryEvdev> event_factory_;

scoped_ptr<ui::DeviceEventDispatcherEvdev> dispatcher_;

- ScopedVector<ui::Event> dispatched_events_;

+ std::vector<scoped_ptr<ui::Event>> dispatched_events_;

int events_out_;

int events_in_;