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

Unified Diff: cc/test/animation_timelines_test_common.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/animation_timelines_test_common.h ('k') | cc/test/cc_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/animation_timelines_test_common.cc
diff --git a/cc/test/animation_timelines_test_common.cc b/cc/test/animation_timelines_test_common.cc
index f9417360e52ae64d0c8257d29a8266b92393cd16..8da1721dc6b2e1a36603dcce4115c33580805ede 100644
--- a/cc/test/animation_timelines_test_common.cc
+++ b/cc/test/animation_timelines_test_common.cc
@@ -4,6 +4,7 @@
#include "cc/test/animation_timelines_test_common.h"
+#include "base/memory/ptr_util.h"
#include "cc/animation/animation_events.h"
#include "cc/animation/animation_id_provider.h"
#include "cc/animation/animation_player.h"
@@ -16,8 +17,8 @@
namespace cc {
-scoped_ptr<TestLayer> TestLayer::Create() {
- return make_scoped_ptr(new TestLayer());
+std::unique_ptr<TestLayer> TestLayer::Create() {
+ return base::WrapUnique(new TestLayer());
}
TestLayer::TestLayer() {
@@ -234,7 +235,7 @@ void AnimationTimelinesTest::ReleaseRefPtrs() {
void AnimationTimelinesTest::AnimateLayersTransferEvents(
base::TimeTicks time,
unsigned expect_events) {
- scoped_ptr<AnimationEvents> events =
+ std::unique_ptr<AnimationEvents> events =
host_->animation_registrar()->CreateEvents();
host_impl_->animation_registrar()->AnimateLayers(time);
« no previous file with comments | « cc/test/animation_timelines_test_common.h ('k') | cc/test/cc_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698