(trybot test) base: Make ScopedPtrMap use DISALLOW_COPY_AND_ASSIGN

sync/engine/commit.h

Index: sync/engine/commit.h
diff --git a/sync/engine/commit.h b/sync/engine/commit.h
index d1ea5529dc177150b2b5c460a3e809597dded6dc..604fc91a4821811f0ef706a4ee39d39de19ad53d 100644
--- a/sync/engine/commit.h
+++ b/sync/engine/commit.h
@@ -6,6 +6,7 @@
 #define SYNC_ENGINE_COMMIT_H_
 
 #include "base/containers/scoped_ptr_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "sync/base/sync_export.h"
 #include "sync/engine/commit_contribution.h"
@@ -36,8 +37,7 @@ class Syncer;
 // PostAndProcessCommitResponse() functions.  So they ended up here.
 class SYNC_EXPORT_PRIVATE Commit {
  public:
-  typedef base::ScopedPtrMap<ModelType, scoped_ptr<CommitContribution>>
-      ContributionMap;
+  typedef std::map<ModelType, scoped_ptr<CommitContribution>> ContributionMap;
 
   Commit(ContributionMap contributions,
          const sync_pb::ClientToServerMessage& message,
@@ -73,6 +73,8 @@ class SYNC_EXPORT_PRIVATE Commit {
 
   // Debug only flag used to indicate if it's safe to destruct the object.
   bool cleaned_up_;
+
+  DISALLOW_COPY_AND_ASSIGN(Commit);
 };
 
 }  // namespace syncer