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

Unified Diff: components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc

Issue 1906973002: Convert //components/bookmarks from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: 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());
« no previous file with comments | « components/bookmarks/browser/bookmark_codec_unittest.cc ('k') | components/bookmarks/browser/bookmark_index_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698