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

Unified Diff: ui/views/animation/ink_drop_animation_controller_factory_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
Index: ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
index 2d430edcaeb98a023e20de69088e2be5f306bfe6..3f4d09cb02e66f83549abd8d92772d19a63a3b55 100644
--- a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
@@ -2,8 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/animation/ink_drop_animation_controller_factory.h"
+
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/test/test_mock_time_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "base/timer/timer.h"
@@ -12,7 +15,6 @@
#include "ui/base/test/material_design_controller_test_api.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/views/animation/ink_drop_animation_controller.h"
-#include "ui/views/animation/ink_drop_animation_controller_factory.h"
#include "ui/views/animation/ink_drop_animation_controller_impl.h"
#include "ui/views/animation/ink_drop_host.h"
#include "ui/views/animation/ink_drop_state.h"
@@ -33,16 +35,16 @@ class InkDropAnimationControllerFactoryTest
// The InkDropAnimationController returned by the
// InkDropAnimationControllerFactory test target.
- scoped_ptr<InkDropAnimationController> ink_drop_animation_controller_;
+ std::unique_ptr<InkDropAnimationController> ink_drop_animation_controller_;
private:
// Extracts and returns the material design mode from the test parameters.
ui::MaterialDesignController::Mode GetMaterialMode() const;
- scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
+ std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
// Required by base::Timer's.
- scoped_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
+ std::unique_ptr<base::ThreadTaskRunnerHandle> thread_task_runner_handle_;
DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerFactoryTest);
};
« no previous file with comments | « ui/views/animation/ink_drop_animation_controller_factory.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698