(trybot test) base: Make ScopedPtrMap use DISALLOW_COPY_AND_ASSIGN

sync/engine/commit_processor.cc

 // Copyright 2014 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_processor.h"
 
 #include <map>
+#include <utility>
 
 #include "sync/engine/commit_contribution.h"
 #include "sync/engine/commit_contributor.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 typedef std::map<ModelType, size_t> TypeToIndexMap;
 
 CommitProcessor::CommitProcessor(CommitContributorMap* commit_contributor_map)
@@ skipping 14 matching lines @@
       NOTREACHED()
           << "Could not find requested type " << ModelTypeToString(it.Get())
           << " in contributor map.";
       continue;
     }
     size_t spaces_remaining = max_entries - num_entries;
     scoped_ptr<CommitContribution> contribution =
         cm_it->second->GetContribution(spaces_remaining);
     if (contribution) {
       num_entries += contribution->GetNumEntries();
-      contributions->insert(it.Get(), contribution.Pass());
+      DCHECK(!contributions->count(it.Get()));
+      (*contributions)[it.Get()] = std::move(contribution);

[Nico, 2015/12/01 01:02:16]

Should there be a comment here saying that this uses foo[] instead of
foo.insert() to work around an msvs2013 bug?

[danakj, 2015/12/01 01:03:12]

Oh, or maybe we don't need to do this and can insert(std::make_pair(...)) cuz
this didn't fix anything anyways.

[vmpstr, 2015/12/01 01:03:58]

Oh this was just me applying the latest patchset, I think a pair would work
here. I'll create a different review once the other patch lands.

I'm closing this for now.

     }
     if (num_entries >= max_entries) {
       DCHECK_EQ(num_entries, max_entries)
           << "Number of commit entries exceeeds maximum";
       break;
     }
   }
 }
 
 }  // namespace syncer