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

Unified Diff: sync/engine/commit.cc

Issue 1480773002: base: Make ScopedPtrMap use DISALLOW_COPY_AND_ASSIGN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move-only-1: dontchangetype Created 5 years, 1 month 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
« no previous file with comments | « base/containers/scoped_ptr_map_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/commit.cc
diff --git a/sync/engine/commit.cc b/sync/engine/commit.cc
index 743996d026ba062c777f01f5a0615a506cc40b3f..c089cc973306ad0533e8bd5876c98ca5a2f656b2 100644
--- a/sync/engine/commit.cc
+++ b/sync/engine/commit.cc
@@ -21,11 +21,10 @@ namespace syncer {
Commit::Commit(ContributionMap contributions,
const sync_pb::ClientToServerMessage& message,
ExtensionsActivity::Records extensions_activity_buffer)
- : contributions_(contributions.Pass()),
+ : contributions_(std::move(contributions)),
message_(message),
extensions_activity_buffer_(extensions_activity_buffer),
- cleaned_up_(false) {
-}
+ cleaned_up_(false) {}
Commit::~Commit() {
DCHECK(cleaned_up_);
@@ -88,7 +87,8 @@ Commit* Commit::Init(
}
// If we made it this far, then we've successfully prepared a commit message.
- return new Commit(contributions.Pass(), message, extensions_activity_buffer);
+ return new Commit(std::move(contributions), message,
+ extensions_activity_buffer);
}
SyncerError Commit::PostAndProcessResponse(
« no previous file with comments | « base/containers/scoped_ptr_map_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698