sync/engine/commit_processor.cc - Issue 1096983002: Update usages of std::map to use ScopedPtrMap.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/engine/commit_processor.cc

Issue 1096983002: Update usages of std::map to use ScopedPtrMap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@passwordmanager-scopedmemory

Patch Set: Rebase. Created 5 years, 6 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/commit_processor.cc

diff --git a/sync/engine/commit_processor.cc b/sync/engine/commit_processor.cc

index d9bd423bb996587841a02ba9e8a9b86bd9cd066f..a5149acdb4e258e7f9aa55e3534885674ee2b499 100644

--- a/sync/engine/commit_processor.cc

+++ b/sync/engine/commit_processor.cc

@@ -22,7 +22,7 @@ CommitProcessor::~CommitProcessor() {}

void CommitProcessor::GatherCommitContributions(

ModelTypeSet commit_types,

size_t max_entries,

- ContributionMap* contributions) {

+ Commit::ContributionMap* contributions) {

size_t num_entries = 0;

for (ModelTypeSet::Iterator it = commit_types.First();

it.Good(); it.Inc()) {

@@ -39,7 +39,7 @@ void CommitProcessor::GatherCommitContributions(

cm_it->second->GetContribution(spaces_remaining);

if (contribution) {

num_entries += contribution->GetNumEntries();

- contributions->insert(std::make_pair(it.Get(), contribution.release()));

+ contributions->insert(it.Get(), contribution.Pass());

}

if (num_entries >= max_entries) {

DCHECK_EQ(num_entries, max_entries)

« no previous file with comments | « sync/engine/commit_processor.h ('k') | sync/engine/directory_update_handler_unittest.cc » ('j') | no next file with comments »