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

Unified Diff: ui/views/animation/bounds_animator_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/views/animation/bounds_animator.cc ('k') | ui/views/animation/button_ink_drop_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/bounds_animator_unittest.cc
diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc
index 7e09deba51081ae46836c6132c614aeb32587824..f8421ae6af522ab04b19b01c0c535cfbf190f3dc 100644
--- a/ui/views/animation/bounds_animator_unittest.cc
+++ b/ui/views/animation/bounds_animator_unittest.cc
@@ -114,7 +114,8 @@ TEST_F(BoundsAnimatorTest, AnimateViewTo) {
gfx::Rect target_bounds(10, 10, 20, 20);
animator()->AnimateViewTo(child(), target_bounds);
animator()->SetAnimationDelegate(
- child(), scoped_ptr<gfx::AnimationDelegate>(new TestAnimationDelegate()));
+ child(),
+ std::unique_ptr<gfx::AnimationDelegate>(new TestAnimationDelegate()));
// The animator should be animating now.
EXPECT_TRUE(animator()->IsAnimating());
@@ -136,7 +137,7 @@ TEST_F(BoundsAnimatorTest, AnimateViewTo) {
TEST_F(BoundsAnimatorTest, DeleteDelegateOnCancel) {
animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10));
animator()->SetAnimationDelegate(
- child(), scoped_ptr<gfx::AnimationDelegate>(new OwnedDelegate()));
+ child(), std::unique_ptr<gfx::AnimationDelegate>(new OwnedDelegate()));
animator()->Cancel();
@@ -153,7 +154,7 @@ TEST_F(BoundsAnimatorTest, DeleteDelegateOnCancel) {
TEST_F(BoundsAnimatorTest, DeleteDelegateOnNewAnimate) {
animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10));
animator()->SetAnimationDelegate(
- child(), scoped_ptr<gfx::AnimationDelegate>(new OwnedDelegate()));
+ child(), std::unique_ptr<gfx::AnimationDelegate>(new OwnedDelegate()));
animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10));
@@ -164,11 +165,11 @@ TEST_F(BoundsAnimatorTest, DeleteDelegateOnNewAnimate) {
// Makes sure StopAnimating works.
TEST_F(BoundsAnimatorTest, StopAnimating) {
- scoped_ptr<OwnedDelegate> delegate(new OwnedDelegate());
+ std::unique_ptr<OwnedDelegate> delegate(new OwnedDelegate());
animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10));
animator()->SetAnimationDelegate(
- child(), scoped_ptr<gfx::AnimationDelegate>(new OwnedDelegate()));
+ child(), std::unique_ptr<gfx::AnimationDelegate>(new OwnedDelegate()));
animator()->StopAnimatingView(child());
« no previous file with comments | « ui/views/animation/bounds_animator.cc ('k') | ui/views/animation/button_ink_drop_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698