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

Unified Diff: cc/test/fake_painted_scrollbar_layer.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/test/fake_painted_scrollbar_layer.h ('k') | cc/test/fake_picture_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/fake_painted_scrollbar_layer.cc
diff --git a/cc/test/fake_painted_scrollbar_layer.cc b/cc/test/fake_painted_scrollbar_layer.cc
index 14964eb500762387d2a8ffbb9c76167a42f2aea8..3fbd15f71b15510f258cb38275af71f7a34e015c 100644
--- a/cc/test/fake_painted_scrollbar_layer.cc
+++ b/cc/test/fake_painted_scrollbar_layer.cc
@@ -5,6 +5,7 @@
#include "cc/test/fake_painted_scrollbar_layer.h"
#include "base/auto_reset.h"
+#include "base/memory/ptr_util.h"
#include "cc/test/fake_scrollbar.h"
namespace cc {
@@ -22,7 +23,7 @@ scoped_refptr<FakePaintedScrollbarLayer> FakePaintedScrollbarLayer::Create(
FakePaintedScrollbarLayer::FakePaintedScrollbarLayer(
FakeScrollbar* fake_scrollbar,
int scrolling_layer_id)
- : PaintedScrollbarLayer(scoped_ptr<Scrollbar>(fake_scrollbar),
+ : PaintedScrollbarLayer(std::unique_ptr<Scrollbar>(fake_scrollbar),
scrolling_layer_id),
update_count_(0),
push_properties_count_(0),
@@ -44,9 +45,9 @@ void FakePaintedScrollbarLayer::PushPropertiesTo(LayerImpl* layer) {
++push_properties_count_;
}
-scoped_ptr<base::AutoReset<bool>>
+std::unique_ptr<base::AutoReset<bool>>
FakePaintedScrollbarLayer::IgnoreSetNeedsCommit() {
- return make_scoped_ptr(
+ return base::WrapUnique(
new base::AutoReset<bool>(&ignore_set_needs_commit_, true));
}
« no previous file with comments | « cc/test/fake_painted_scrollbar_layer.h ('k') | cc/test/fake_picture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698