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

Unified Diff: sync/engine/directory_commit_contribution.cc

Issue 1866243002: Convert //sync 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: sync/engine/directory_commit_contribution.cc
diff --git a/sync/engine/directory_commit_contribution.cc b/sync/engine/directory_commit_contribution.cc
index 00af906fea60f489b029110ca543841293ab5cf9..e52fa83217e423b2bde94fa7ed998cb2cef33a72 100644
--- a/sync/engine/directory_commit_contribution.cc
+++ b/sync/engine/directory_commit_contribution.cc
@@ -27,7 +27,7 @@ DirectoryCommitContribution::~DirectoryCommitContribution() {
}
// static.
-scoped_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
+std::unique_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
syncable::Directory* dir,
ModelType type,
size_t max_entries,
@@ -40,7 +40,7 @@ scoped_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
GetCommitIdsForType(&trans, type, max_entries, &metahandles);
if (metahandles.empty())
- return scoped_ptr<DirectoryCommitContribution>();
+ return std::unique_ptr<DirectoryCommitContribution>();
google::protobuf::RepeatedPtrField<sync_pb::SyncEntity> entities;
for (std::vector<int64_t>::iterator it = metahandles.begin();
@@ -54,13 +54,9 @@ scoped_ptr<DirectoryCommitContribution> DirectoryCommitContribution::Build(
sync_pb::DataTypeContext context;
dir->GetDataTypeContext(&trans, type, &context);
- return scoped_ptr<DirectoryCommitContribution>(
- new DirectoryCommitContribution(
- metahandles,
- entities,
- context,
- dir,
- debug_info_emitter));
+ return std::unique_ptr<DirectoryCommitContribution>(
+ new DirectoryCommitContribution(metahandles, entities, context, dir,
+ debug_info_emitter));
}
void DirectoryCommitContribution::AddToCommitMessage(

Powered by Google App Engine
This is Rietveld 408576698