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

Unified Diff: components/ntp_snippets/ntp_snippets_database.cc

Issue 2257793002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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/ntp_snippets/ntp_snippets_database.cc
diff --git a/components/ntp_snippets/ntp_snippets_database.cc b/components/ntp_snippets/ntp_snippets_database.cc
index 4b1427961588e4f70a4b0591d526aa3279479b0d..547aaa16aa5749739bae34587e68fe95d628d8de 100644
--- a/components/ntp_snippets/ntp_snippets_database.cc
+++ b/components/ntp_snippets/ntp_snippets_database.cc
@@ -84,8 +84,7 @@ void NTPSnippetsDatabase::SaveSnippets(const NTPSnippet::PtrVector& snippets) {
}
void NTPSnippetsDatabase::DeleteSnippet(const std::string& snippet_id) {
- DeleteSnippetsImpl(
- base::WrapUnique(new std::vector<std::string>(1, snippet_id)));
+ DeleteSnippetsImpl(base::MakeUnique<std::vector<std::string>>(1, snippet_id));
}
void NTPSnippetsDatabase::DeleteSnippets(
@@ -117,15 +116,13 @@ void NTPSnippetsDatabase::SaveImage(const std::string& snippet_id,
entries_to_save->emplace_back(snippet_id, std::move(image_proto));
image_database_->UpdateEntries(
- std::move(entries_to_save),
- base::WrapUnique(new std::vector<std::string>()),
+ std::move(entries_to_save), base::MakeUnique<std::vector<std::string>>(),
base::Bind(&NTPSnippetsDatabase::OnImageDatabaseSaved,
weak_ptr_factory_.GetWeakPtr()));
}
void NTPSnippetsDatabase::DeleteImage(const std::string& snippet_id) {
- DeleteImagesImpl(
- base::WrapUnique(new std::vector<std::string>(1, snippet_id)));
+ DeleteImagesImpl(base::MakeUnique<std::vector<std::string>>(1, snippet_id));
}
void NTPSnippetsDatabase::OnDatabaseInited(bool success) {
@@ -259,8 +256,7 @@ void NTPSnippetsDatabase::DeleteSnippetsImpl(
std::unique_ptr<std::vector<std::string>> keys_to_remove) {
DCHECK(IsInitialized());
- DeleteImagesImpl(
- base::WrapUnique(new std::vector<std::string>(*keys_to_remove)));
+ DeleteImagesImpl(base::MakeUnique<std::vector<std::string>>(*keys_to_remove));
std::unique_ptr<KeyEntryVector> entries_to_save(new KeyEntryVector());
database_->UpdateEntries(std::move(entries_to_save),
@@ -283,8 +279,7 @@ void NTPSnippetsDatabase::DeleteImagesImpl(
DCHECK(IsInitialized());
image_database_->UpdateEntries(
- base::WrapUnique(new ImageKeyEntryVector()),
- std::move(keys_to_remove),
+ base::MakeUnique<ImageKeyEntryVector>(), std::move(keys_to_remove),
base::Bind(&NTPSnippetsDatabase::OnImageDatabaseSaved,
weak_ptr_factory_.GetWeakPtr()));
}

Powered by Google App Engine
This is Rietveld 408576698