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

Unified Diff: ui/gfx/animation/animation_container_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/x/events_x_unittest.cc ('k') | ui/gfx/animation/slide_animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/animation_container_unittest.cc
diff --git a/ui/gfx/animation/animation_container_unittest.cc b/ui/gfx/animation/animation_container_unittest.cc
index bffe38788855b863a994d4abcc86bc1fcf92f068..b1bb7911e6a5a751d6e09aa191d1fe6ee4cf0d8a 100644
--- a/ui/gfx/animation/animation_container_unittest.cc
+++ b/ui/gfx/animation/animation_container_unittest.cc
@@ -4,8 +4,9 @@
#include "ui/gfx/animation/animation_container.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/animation/animation_container_observer.h"
#include "ui/gfx/animation/linear_animation.h"
@@ -65,7 +66,7 @@ class AnimationContainerTest: public testing::Test {
TEST_F(AnimationContainerTest, Ownership) {
TestAnimationDelegate delegate;
scoped_refptr<AnimationContainer> container(new AnimationContainer());
- scoped_ptr<Animation> animation(new TestAnimation(&delegate));
+ std::unique_ptr<Animation> animation(new TestAnimation(&delegate));
animation->SetContainer(container.get());
// Setting the container should up the ref count.
EXPECT_FALSE(container->HasOneRef());
« no previous file with comments | « ui/events/x/events_x_unittest.cc ('k') | ui/gfx/animation/slide_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698