| Index: components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
|
| diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
|
| index 76c0160f3e62c3841a2d7c17c4ab6312737a2a2c..fd8a1325f3d05be96f6ba006c60d0c615b53f915 100644
|
| --- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
|
| +++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/thread_task_runner_handle.h"
|
| @@ -31,7 +32,7 @@ class BookmarkExpandedStateTrackerTest : public testing::Test {
|
|
|
| base::MessageLoop message_loop_;
|
| TestingPrefServiceSimple prefs_;
|
| - scoped_ptr<BookmarkModel> model_;
|
| + std::unique_ptr<BookmarkModel> model_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BookmarkExpandedStateTrackerTest);
|
| };
|
| @@ -44,7 +45,7 @@ void BookmarkExpandedStateTrackerTest::SetUp() {
|
| prefs_.registry()->RegisterListPref(prefs::kBookmarkEditorExpandedNodes,
|
| new base::ListValue);
|
| prefs_.registry()->RegisterListPref(prefs::kManagedBookmarks);
|
| - model_.reset(new BookmarkModel(make_scoped_ptr(new TestBookmarkClient())));
|
| + model_.reset(new BookmarkModel(base::WrapUnique(new TestBookmarkClient())));
|
| model_->Load(&prefs_, base::FilePath(),
|
| base::ThreadTaskRunnerHandle::Get(),
|
| base::ThreadTaskRunnerHandle::Get());
|
|
|