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

Unified Diff: cc/test/animation_timelines_test_common.h

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_test_common.cc ('k') | cc/test/animation_timelines_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/animation_timelines_test_common.h
diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h
index bb409796b6305365ff0fec00d931083da195e3d6..e32f13c46ec7e446d4885723f0d6f5a838f96d81 100644
--- a/cc/test/animation_timelines_test_common.h
+++ b/cc/test/animation_timelines_test_common.h
@@ -5,9 +5,9 @@
#ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
#define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_
+#include <memory>
#include <unordered_map>
-#include "base/memory/scoped_ptr.h"
#include "cc/animation/animation.h"
#include "cc/animation/animation_delegate.h"
#include "cc/animation/animation_host.h"
@@ -19,7 +19,7 @@ namespace cc {
class TestLayer {
public:
- static scoped_ptr<TestLayer> Create();
+ static std::unique_ptr<TestLayer> Create();
void ClearMutatedProperties();
@@ -133,9 +133,10 @@ class TestHostClient : public MutatorHostClient {
TestLayer* FindTestLayer(int layer_id, LayerTreeType tree_type) const;
private:
- scoped_ptr<AnimationHost> host_;
+ std::unique_ptr<AnimationHost> host_;
- using LayerIdToTestLayer = std::unordered_map<int, scoped_ptr<TestLayer>>;
+ using LayerIdToTestLayer =
+ std::unordered_map<int, std::unique_ptr<TestLayer>>;
LayerIdToTestLayer layers_in_active_tree_;
LayerIdToTestLayer layers_in_pending_tree_;
@@ -158,7 +159,8 @@ class TestAnimationDelegate : public AnimationDelegate {
void NotifyAnimationTakeover(base::TimeTicks monotonic_time,
TargetProperty::Type target_property,
double animation_start_time,
- scoped_ptr<AnimationCurve> curve) override {}
+ std::unique_ptr<AnimationCurve> curve) override {
+ }
bool started_;
bool finished_;
};
« no previous file with comments | « cc/test/animation_test_common.cc ('k') | cc/test/animation_timelines_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698