Update usages of std::map to use ScopedPtrMap.

sync/engine/model_type_sync_proxy_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_PROXY_IMPL_H_
 #define SYNC_ENGINE_MODEL_TYPE_SYNC_PROXY_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/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 class SyncContextProxy;
 class ModelTypeEntity;
@@ skipping 62 matching lines @@
   // The current test harness setup doesn't allow us to test the data that the
   // proxy sends to the worker during initialization, so we use this to inspect
   // its state instead.
   UpdateResponseDataList GetPendingUpdates();
 
   // Returns the long-lived WeakPtr that is intended to be registered with the
   // ProfileSyncService.
   base::WeakPtr<ModelTypeSyncProxyImpl> AsWeakPtrForUI();
 
  private:
-  typedef std::map<std::string, ModelTypeEntity*> EntityMap;
-  typedef std::map<std::string, UpdateResponseData*> UpdateMap;
+  typedef base::ScopedPtrMap<std::string, scoped_ptr<ModelTypeEntity>>
+      EntityMap;
+  typedef base::ScopedPtrMap<std::string, scoped_ptr<UpdateResponseData>>
+      UpdateMap;
 
   // Sends all commit requests that are due to be sent to the sync thread.
   void FlushPendingCommitRequests();
 
   // Clears any state related to outstanding communications with the
   // ModelTypeSyncWorker.  Used when we want to disconnect from
   // the current worker.
   void ClearTransientSyncState();
 
   // Clears any state related to our communications with the current sync
@@ skipping 20 matching lines @@
 
   // Reference to the ModelTypeSyncWorker.
   //
   // The interface hides the posting of tasks across threads as well as the
   // ModelTypeSyncWorker's implementation.  Both of these features are
   // useful in tests.
   scoped_ptr<ModelTypeSyncWorker> worker_;
 
   // The set of sync entities known to this object.
   EntityMap entities_;
-  STLValueDeleter<EntityMap> entities_deleter_;
 
   // A set of updates that can not be applied at this time.  These are never
   // used by the model.  They are kept here only so we can save and restore
   // them across restarts, and keep them in sync with our progress markers.
   UpdateMap pending_updates_map_;
-  STLValueDeleter<UpdateMap> pending_updates_map_deleter_;
 
   // We use two different WeakPtrFactories because we want the pointers they
   // issue to have different lifetimes.  When asked to disconnect from the sync
   // thread, we want to make sure that no tasks generated as part of the
   // now-obsolete connection to affect us.  But we also want the WeakPtr we
   // sent to the UI thread to remain valid.
   base::WeakPtrFactory<ModelTypeSyncProxyImpl> weak_ptr_factory_for_ui_;
   base::WeakPtrFactory<ModelTypeSyncProxyImpl> weak_ptr_factory_for_sync_;
 };
 
 }  // namespace syncer
 
 #endif  // SYNC_ENGINE_MODEL_TYPE_SYNC_PROXY_IMPL_H_