Update usages of std::map to use ScopedPtrMap.

components/sync_driver/non_blocking_data_type_manager.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 COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_MANAGER_H_
 #define COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_MANAGER_H_
 
-#include <map>
-
+#include "base/containers/scoped_ptr_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/stl_util.h"
 #include "sync/internal_api/public/base/model_type.h"
 
 namespace base {
 class SequencedTaskRunner;
 }  // namespace base
 
 namespace syncer {
 class ModelTypeSyncProxyImpl;
 class SyncContextProxy;
 }  //namespace syncer
@@ skipping 35 matching lines @@
   void DisconnectSyncBackend();
 
   // Updates the set of types the user wants to have synced.
   void SetPreferredTypes(syncer::ModelTypeSet types);
 
   // Returns the list of all known non-blocking sync types that registered with
   // RegisterType.
   syncer::ModelTypeSet GetRegisteredTypes() const;
 
  private:
-  typedef
-      std::map<syncer::ModelType, NonBlockingDataTypeController*>
+  typedef base::ScopedPtrMap<syncer::ModelType,
+                             scoped_ptr<NonBlockingDataTypeController>>
       NonBlockingDataTypeControllerMap;
 
   // List of data type controllers for non-blocking types.
   NonBlockingDataTypeControllerMap non_blocking_data_type_controllers_;
-
-  // Deleter for elements of the non-blocking data types controller map.
-  STLValueDeleter<NonBlockingDataTypeControllerMap>
-      non_blocking_data_type_controllers_deleter_;
 };
 
 }  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_NON_BLOCKING_DATA_TYPE_MANAGER_H_