| Index: ui/views/animation/test/test_ink_drop_host.cc
|
| diff --git a/ui/views/animation/test/test_ink_drop_host.cc b/ui/views/animation/test/test_ink_drop_host.cc
|
| index 5b46b0da280527e5f37fce203d3894c117154b66..c919b685b3c9046a565ac4b883757f8e6c2001c6 100644
|
| --- a/ui/views/animation/test/test_ink_drop_host.cc
|
| +++ b/ui/views/animation/test/test_ink_drop_host.cc
|
| @@ -2,10 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "ui/views/animation/test/test_ink_drop_host.h"
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/views/animation/ink_drop_hover.h"
|
| #include "ui/views/animation/square_ink_drop_animation.h"
|
| -#include "ui/views/animation/test/test_ink_drop_host.h"
|
|
|
| namespace views {
|
|
|
| @@ -22,16 +24,17 @@ void TestInkDropHost::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
|
| --num_ink_drop_layers_;
|
| }
|
|
|
| -scoped_ptr<InkDropAnimation> TestInkDropHost::CreateInkDropAnimation() const {
|
| +std::unique_ptr<InkDropAnimation> TestInkDropHost::CreateInkDropAnimation()
|
| + const {
|
| gfx::Size size(10, 10);
|
| - return make_scoped_ptr(new SquareInkDropAnimation(
|
| + return base::WrapUnique(new SquareInkDropAnimation(
|
| size, 5, size, 5, gfx::Point(), SK_ColorBLACK));
|
| }
|
|
|
| -scoped_ptr<InkDropHover> TestInkDropHost::CreateInkDropHover() const {
|
| +std::unique_ptr<InkDropHover> TestInkDropHost::CreateInkDropHover() const {
|
| return should_show_hover_
|
| - ? make_scoped_ptr(new InkDropHover(gfx::Size(10, 10), 4,
|
| - gfx::Point(), SK_ColorBLACK))
|
| + ? base::WrapUnique(new InkDropHover(gfx::Size(10, 10), 4,
|
| + gfx::Point(), SK_ColorBLACK))
|
| : nullptr;
|
| }
|
|
|
|
|