ScopedPtrMap -> std::map from /component

components/sync_driver/device_info_service.h

 // Copyright 2015 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_DEVICE_INFO_SERVICE_H_
 #define COMPONENTS_SYNC_DRIVER_DEVICE_INFO_SERVICE_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
-#include "base/containers/scoped_ptr_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "components/sync_driver/device_info_tracker.h"
 #include "components/sync_driver/local_device_info_provider.h"
 #include "sync/api/model_type_service.h"
 
 namespace syncer {
 class SyncError;
 }  // namespace syncer
@@ skipping 78 matching lines @@
   // TODO(skym): Remove once we remove local provider.
   // Local device last set backup time (in proto format).
   // -1 if the value hasn't been specified
   int64 local_device_backup_time_;
 
   // |local_device_info_provider_| isn't owned.
   const sync_driver::LocalDeviceInfoProvider* const local_device_info_provider_;
 
   // TODO(skym): Switch to use client tag hash instead of cache guid as key.
   // Cache of all syncable and local data, stored by device cache guid.
-  typedef base::ScopedPtrMap<std::string,
-                             scoped_ptr<sync_pb::DeviceInfoSpecifics>>
-      ClientIdToSpecifics;
+  using ClientIdToSpecifics =
+      std::map<std::string, scoped_ptr<sync_pb::DeviceInfoSpecifics>>;
   ClientIdToSpecifics all_data_;
 
   // Registered observers, not owned.
   base::ObserverList<Observer, true> observers_;
 
   scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription> subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfoService);
 };
 
 }  // namespace sync_driver_v2
 
 #endif  // COMPONENTS_SYNC_DRIVER_DEVICE_INFO_SERVICE_H_