Update usages of std::map to use ScopedPtrMap.

sync/engine/model_type_sync_worker_impl.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_MODEL_TYPE_SYNC_WORKER_IMPL_H_
 #define SYNC_ENGINE_MODEL_TYPE_SYNC_WORKER_IMPL_H_
 
+#include "base/containers/scoped_ptr_map.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/stl_util.h"
 #include "base/threading/non_thread_safe.h"
 #include "sync/base/sync_export.h"
 #include "sync/engine/commit_contributor.h"
 #include "sync/engine/model_type_sync_worker.h"
 #include "sync/engine/nudge_handler.h"
 #include "sync/engine/update_handler.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/internal_api/public/sync_encryption_handler.h"
 #include "sync/protocol/sync.pb.h"
@@ skipping 63 matching lines @@
 
   // CommitContributor implementation.
   scoped_ptr<CommitContribution> GetContribution(size_t max_entries) override;
 
   // Callback for when our contribution gets a response.
   void OnCommitResponse(const CommitResponseDataList& response_list);
 
   base::WeakPtr<ModelTypeSyncWorkerImpl> AsWeakPtr();
 
  private:
-  typedef std::map<std::string, EntityTracker*> EntityMap;
-  typedef std::map<std::string, UpdateResponseData*> UpdateMap;
+  typedef base::ScopedPtrMap<std::string, scoped_ptr<EntityTracker>> EntityMap;
 
   // Stores a single commit request in this object's internal state.
   void StorePendingCommit(const CommitRequestData& request);
 
   // Returns true if this type has successfully fetched all available updates
   // from the server at least once.  Our state may or may not be stale, but at
   // least we know that it was valid at some point in the past.
   bool IsTypeInitialized() const;
 
   // Returns true if this type is prepared to commit items.  Currently, this
@@ skipping 48 matching lines @@
   // When commits are pending, their information is stored here.  This
   // information is dropped from memory when the commit succeeds or gets
   // cancelled.
   //
   // This also stores some information related to received server state in
   // order to implement reflection blocking and conflict detection.  This
   // information is kept in memory indefinitely.  With a bit more coordination
   // with the model thread, we could optimize this to reduce memory usage in
   // the steady state.
   EntityMap entities_;
-  STLValueDeleter<EntityMap> entities_deleter_;
 
   base::WeakPtrFactory<ModelTypeSyncWorkerImpl> weak_ptr_factory_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_MODEL_TYPE_SYNC_WORKER_IMPL_H_