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

Unified Diff: ui/events/event_rewriter_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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/event_rewriter.h ('k') | ui/events/event_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event_rewriter_unittest.cc
diff --git a/ui/events/event_rewriter_unittest.cc b/ui/events/event_rewriter_unittest.cc
index 7983e72241cc0952c18b0d4dbd8eabb58490275f..335f3bc02317ca72e0fdea4501a0bf5ca03b143e 100644
--- a/ui/events/event_rewriter_unittest.cc
+++ b/ui/events/event_rewriter_unittest.cc
@@ -65,7 +65,7 @@ class TestEventRewriteSource : public EventSource {
: processor_(processor) {}
EventProcessor* GetEventProcessor() override { return processor_; }
void Send(EventType type) {
- scoped_ptr<Event> event(new TestEvent(type));
+ std::unique_ptr<Event> event(new TestEvent(type));
(void)SendEventToProcessor(event.get());
}
@@ -84,14 +84,16 @@ class TestConstantEventRewriter : public EventRewriter {
CHECK_NE(EVENT_REWRITE_DISPATCH_ANOTHER, status);
}
- EventRewriteStatus RewriteEvent(const Event& event,
- scoped_ptr<Event>* rewritten_event) override {
+ EventRewriteStatus RewriteEvent(
+ const Event& event,
+ std::unique_ptr<Event>* rewritten_event) override {
if (status_ == EVENT_REWRITE_REWRITTEN)
rewritten_event->reset(new TestEvent(type_));
return status_;
}
- EventRewriteStatus NextDispatchEvent(const Event& last_event,
- scoped_ptr<Event>* new_event) override {
+ EventRewriteStatus NextDispatchEvent(
+ const Event& last_event,
+ std::unique_ptr<Event>* new_event) override {
NOTREACHED();
return status_;
}
@@ -112,8 +114,9 @@ class TestStateMachineEventRewriter : public EventRewriter {
rules_.insert(std::pair<RewriteCase, RewriteResult>(
RewriteCase(from_state, from_type), r));
}
- EventRewriteStatus RewriteEvent(const Event& event,
- scoped_ptr<Event>* rewritten_event) override {
+ EventRewriteStatus RewriteEvent(
+ const Event& event,
+ std::unique_ptr<Event>* rewritten_event) override {
RewriteRules::iterator find =
rules_.find(RewriteCase(state_, event.type()));
if (find == rules_.end())
@@ -128,8 +131,9 @@ class TestStateMachineEventRewriter : public EventRewriter {
state_ = find->second.state;
return find->second.status;
}
- EventRewriteStatus NextDispatchEvent(const Event& last_event,
- scoped_ptr<Event>* new_event) override {
+ EventRewriteStatus NextDispatchEvent(
+ const Event& last_event,
+ std::unique_ptr<Event>* new_event) override {
EXPECT_TRUE(last_rewritten_event_);
const TestEvent* arg_last = static_cast<const TestEvent*>(&last_event);
EXPECT_EQ(last_rewritten_event_->unique_id(), arg_last->unique_id());
« no previous file with comments | « ui/events/event_rewriter.h ('k') | ui/events/event_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698