base: Make ScopedPtrMap use DISALLOW_COPY_AND_ASSIGN.

sync/engine/commit.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/engine/commit.h"
 
 #include "base/metrics/sparse_histogram.h"
 #include "base/trace_event/trace_event.h"
 #include "sync/engine/commit_contribution.h"
 #include "sync/engine/commit_processor.h"
 #include "sync/engine/commit_util.h"
 #include "sync/engine/syncer.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/internal_api/public/events/commit_request_event.h"
 #include "sync/internal_api/public/events/commit_response_event.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/util/data_type_histogram.h"
 
 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_);
 }
 
 Commit* Commit::Init(
     ModelTypeSet requested_types,
     ModelTypeSet enabled_types,
     size_t max_entries,
     const std::string& account_name,
@@ skipping 42 matching lines @@
     int local_integer_model_type = ModelTypeToHistogramInt(contribution.first);
     if (current_entry_size > 0) {
       SyncRecordDatatypeBin("DataUse.Sync.Upload.Bytes",
                             local_integer_model_type, current_entry_size);
     }
     UMA_HISTOGRAM_SPARSE_SLOWLY("DataUse.Sync.Upload.Count",
                                 local_integer_model_type);
   }
 
   // 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(
     sessions::NudgeTracker* nudge_tracker,
     sessions::SyncSession* session,
     sessions::StatusController* status,
     ExtensionsActivity* extensions_activity) {
   ModelTypeSet request_types;
   for (ContributionMap::const_iterator it = contributions_.begin();
        it != contributions_.end(); ++it) {
@@ skipping 80 matching lines @@
 
 void Commit::CleanUp() {
   for (ContributionMap::const_iterator it = contributions_.begin();
        it != contributions_.end(); ++it) {
     it->second->CleanUp();
   }
   cleaned_up_ = true;
 }
 
 }  // namespace syncer