Index: cc/input/scrollbar_animation_controller_linear_fade.cc |
diff --git a/cc/input/scrollbar_animation_controller_linear_fade.cc b/cc/input/scrollbar_animation_controller_linear_fade.cc |
index 079ac838f14043134ab4fde02708514ca5a3bb4c..8ead32491a3f9eebd4ccc55b1bdb3f77ab04cf89 100644 |
--- a/cc/input/scrollbar_animation_controller_linear_fade.cc |
+++ b/cc/input/scrollbar_animation_controller_linear_fade.cc |
@@ -4,20 +4,21 @@ |
#include "cc/input/scrollbar_animation_controller_linear_fade.h" |
+#include "base/memory/ptr_util.h" |
#include "base/time/time.h" |
#include "cc/layers/layer_impl.h" |
#include "cc/layers/scrollbar_layer_impl_base.h" |
namespace cc { |
-scoped_ptr<ScrollbarAnimationControllerLinearFade> |
+std::unique_ptr<ScrollbarAnimationControllerLinearFade> |
ScrollbarAnimationControllerLinearFade::Create( |
int scroll_layer_id, |
ScrollbarAnimationControllerClient* client, |
base::TimeDelta delay_before_starting, |
base::TimeDelta resize_delay_before_starting, |
base::TimeDelta duration) { |
- return make_scoped_ptr(new ScrollbarAnimationControllerLinearFade( |
+ return base::WrapUnique(new ScrollbarAnimationControllerLinearFade( |
scroll_layer_id, client, delay_before_starting, |
resize_delay_before_starting, duration)); |
} |