| Index: ash/shelf/shelf_unittest.cc
|
| diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc
|
| index ef8be3442f39fa67325067d98cc36dfed8a59915..1abe5702d5fa99114bbd02658776b2ac53a5d21b 100644
|
| --- a/ash/shelf/shelf_unittest.cc
|
| +++ b/ash/shelf/shelf_unittest.cc
|
| @@ -84,7 +84,7 @@ class ShelfTest : public ash::test::AshTestBase {
|
| ShelfView* shelf_view_;
|
| ShelfModel* shelf_model_;
|
| ShelfItemDelegateManager* item_delegate_manager_;
|
| - scoped_ptr<test::ShelfViewTestAPI> test_;
|
| + std::unique_ptr<test::ShelfViewTestAPI> test_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShelfTest);
|
| };
|
| @@ -120,7 +120,7 @@ TEST_F(ShelfTest, checkHoverAfterMenu) {
|
| item.status = STATUS_RUNNING;
|
| int index = shelf_model()->Add(item);
|
|
|
| - scoped_ptr<ShelfItemDelegate> delegate(
|
| + std::unique_ptr<ShelfItemDelegate> delegate(
|
| new test::TestShelfItemDelegate(NULL));
|
| item_manager()->SetShelfItemDelegate(shelf_model()->items()[index].id,
|
| std::move(delegate));
|
|
|