Update usages of std::map to use ScopedPtrMap.

sync/engine/entity_tracker.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/entity_tracker.h"
 
 #include "base/logging.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/util/time.h"
 
 namespace syncer {
 
-EntityTracker* EntityTracker::FromServerUpdate(
+scoped_ptr<EntityTracker> EntityTracker::FromServerUpdate(
     const std::string& id_string,
     const std::string& client_tag_hash,
     int64 received_version) {
-  return new EntityTracker(id_string, client_tag_hash, 0, received_version);
+  return make_scoped_ptr(
+      new EntityTracker(id_string, client_tag_hash, 0, received_version));
 }
 
-EntityTracker* EntityTracker::FromCommitRequest(
+scoped_ptr<EntityTracker> EntityTracker::FromCommitRequest(
     const std::string& id_string,
     const std::string& client_tag_hash,
     int64 sequence_number,
     int64 base_version,
     base::Time ctime,
     base::Time mtime,
     const std::string& non_unique_name,
     bool deleted,
     const sync_pb::EntitySpecifics& specifics) {
-  return new EntityTracker(id_string,
-                           client_tag_hash,
-                           0,
-                           0,
-                           true,
-                           sequence_number,
-                           base_version,
-                           ctime,
-                           mtime,
-                           non_unique_name,
-                           deleted,
-                           specifics);
+  return make_scoped_ptr(new EntityTracker(
+      id_string, client_tag_hash, 0, 0, true, sequence_number, base_version,
+      ctime, mtime, non_unique_name, deleted, specifics));
 }
 
 // Constructor that does not set any pending commit fields.
 EntityTracker::EntityTracker(const std::string& id,
                              const std::string& client_tag_hash,
                              int64 highest_commit_response_version,
                              int64 highest_gu_response_version)
     : id_(id),
       client_tag_hash_(client_tag_hash),
       highest_commit_response_version_(highest_commit_response_version),
@@ skipping 205 matching lines @@
 }
 
 void EntityTracker::ClearPendingCommit() {
   is_commit_pending_ = false;
 
   // Clearing the specifics might free up some memory.  It can't hurt to try.
   specifics_.Clear();
 }
 
 }  // namespace syncer