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

Unified Diff: ui/events/test/test_event_target.cc

Issue 922923002: ui: Cleanup the usage of scoped_ptr throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 10 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/platform/x11/x11_event_source_libevent.cc ('k') | ui/gfx/render_text_harfbuzz.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/test/test_event_target.cc
diff --git a/ui/events/test/test_event_target.cc b/ui/events/test/test_event_target.cc
index dc0e80dc703af1fbdb78aba39e57c1fce259492e..8ea7438d738841b97acb56fcfdceb857f0458fd7 100644
--- a/ui/events/test/test_event_target.cc
+++ b/ui/events/test/test_event_target.cc
@@ -35,7 +35,7 @@ scoped_ptr<TestEventTarget> TestEventTarget::RemoveChild(TestEventTarget *c) {
if (iter != children_.end()) {
children_.weak_erase(iter);
c->set_parent(NULL);
- return scoped_ptr<TestEventTarget>(c);
+ return make_scoped_ptr(c);
}
return nullptr;
}
@@ -64,7 +64,7 @@ EventTarget* TestEventTarget::GetParentTarget() {
}
scoped_ptr<EventTargetIterator> TestEventTarget::GetChildIterator() const {
- return scoped_ptr<EventTargetIterator>(
+ return make_scoped_ptr(
new EventTargetIteratorImpl<TestEventTarget>(children_.get()));
}
« no previous file with comments | « ui/events/platform/x11/x11_event_source_libevent.cc ('k') | ui/gfx/render_text_harfbuzz.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698