Update usages of std::map to use ScopedPtrMap.

sync/engine/entity_tracker.h

 // 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.
 
 #ifndef SYNC_ENGINE_ENTITY_TRACKER_H_
 #define SYNC_ENGINE_ENTITY_TRACKER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 16 matching lines @@
 // commit state, received update state, and can detect conflicts.
 //
 // This object may or may not contain state associated with a pending commit.
 // If no commit is pending, the |is_commit_pending_| flag will be set to false
 // and many of this object's fields will be cleared.
 class SYNC_EXPORT EntityTracker {
  public:
   ~EntityTracker();
 
   // Initialize a new entity based on an update response.
-  static EntityTracker* FromServerUpdate(const std::string& id_string,
-                                         const std::string& client_tag_hash,
-                                         int64 version);
+  static scoped_ptr<EntityTracker> FromServerUpdate(
+      const std::string& id_string,
+      const std::string& client_tag_hash,
+      int64 version);
 
   // Initialize a new entity based on a commit request.
-  static EntityTracker* FromCommitRequest(
+  static scoped_ptr<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);
 
@@ skipping 113 matching lines @@
   // an pending update prevents commits.  As of this writing, the only source
   // of pending updates is updates we can't decrypt right now.
   scoped_ptr<UpdateResponseData> pending_update_;
 
   DISALLOW_COPY_AND_ASSIGN(EntityTracker);
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_ENTITY_TRACKER_H_