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

Unified Diff: components/bookmarks/browser/bookmark_storage.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_storage.cc
diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
index 3a184206cfb1db0dd44d5d85a6c970ffed9b5e7c..4acd103a2c71d3618803a60dee7010825b2c5c74 100644
--- a/components/bookmarks/browser/bookmark_storage.cc
+++ b/components/bookmarks/browser/bookmark_storage.cc
@@ -52,13 +52,13 @@ void AddBookmarksToIndex(BookmarkLoadDetails* details,
void LoadCallback(const base::FilePath& path,
const base::WeakPtr<BookmarkStorage>& storage,
- scoped_ptr<BookmarkLoadDetails> details,
+ std::unique_ptr<BookmarkLoadDetails> details,
base::SequencedTaskRunner* task_runner) {
bool load_index = false;
bool bookmark_file_exists = base::PathExists(path);
if (bookmark_file_exists) {
JSONFileValueDeserializer deserializer(path);
- scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, NULL);
+ std::unique_ptr<base::Value> root = deserializer.Deserialize(NULL, NULL);
if (root.get()) {
// Building the index can take a while, so we do it on the background
@@ -160,7 +160,7 @@ BookmarkStorage::~BookmarkStorage() {
}
void BookmarkStorage::LoadBookmarks(
- scoped_ptr<BookmarkLoadDetails> details,
+ std::unique_ptr<BookmarkLoadDetails> details,
const scoped_refptr<base::SequencedTaskRunner>& task_runner) {
sequenced_task_runner_->PostTask(
FROM_HERE,
@@ -202,13 +202,14 @@ void BookmarkStorage::BookmarkModelDeleted() {
bool BookmarkStorage::SerializeData(std::string* output) {
BookmarkCodec codec;
- scoped_ptr<base::Value> value(codec.Encode(model_));
+ std::unique_ptr<base::Value> value(codec.Encode(model_));
JSONStringValueSerializer serializer(output);
serializer.set_pretty_print(true);
return serializer.Serialize(*(value.get()));
}
-void BookmarkStorage::OnLoadFinished(scoped_ptr<BookmarkLoadDetails> details) {
+void BookmarkStorage::OnLoadFinished(
+ std::unique_ptr<BookmarkLoadDetails> details) {
if (!model_)
return;
@@ -223,7 +224,7 @@ bool BookmarkStorage::SaveNow() {
return false;
}
- scoped_ptr<std::string> data(new std::string);
+ std::unique_ptr<std::string> data(new std::string);
if (!SerializeData(data.get()))
return false;
writer_.WriteNow(std::move(data));
« no previous file with comments | « components/bookmarks/browser/bookmark_storage.h ('k') | components/bookmarks/browser/bookmark_undo_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698