| Index: ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| diff --git a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| index 96e2d3ed199d76b815fd53305cab02fb240f2488..923315b8e373db7fd4f2e70a64cd5405014286cd 100644
|
| --- a/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| +++ b/ui/views/animation/ink_drop_animation_controller_impl_unittest.cc
|
| @@ -39,11 +39,11 @@ class InkDropAnimationControllerImplTest : public testing::Test {
|
| scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
|
|
|
| // Required by base::Timer's.
|
| - scoped_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
|
| + std::unique_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
|
|
|
| private:
|
| // Ensures all animations complete immediately.
|
| - scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
|
| + std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImplTest);
|
| };
|
|
|