ScopedPtrMap -> std::map from /component

components/sync_driver/device_info_service.cc

 // 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.
 
 #include "components/sync_driver/device_info_service.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "sync/api/model_type_change_processor.h"
@@ skipping 161 matching lines @@
   return make_scoped_ptr(new DeviceInfo(
       specifics.cache_guid(), specifics.client_name(),
       specifics.chrome_version(), specifics.sync_user_agent(),
       specifics.device_type(), specifics.signin_scoped_device_id()));
 }
 
 void DeviceInfoService::StoreSpecifics(
     scoped_ptr<DeviceInfoSpecifics> specifics) {
   DVLOG(1) << "Storing DEVICE_INFO for " << specifics->client_name()
            << " with ID " << specifics->cache_guid();
-  const std::string& key = specifics->cache_guid();
-  all_data_.set(key, specifics.Pass());
+  all_data_[specifics->cache_guid()] = std::move(specifics);
 }
 
 void DeviceInfoService::DeleteSpecifics(const std::string& client_id) {
   ClientIdToSpecifics::const_iterator iter = all_data_.find(client_id);
   if (iter != all_data_.end()) {
     DVLOG(1) << "Deleting DEVICE_INFO for " << iter->second->client_name()
              << " with ID " << client_id;
     all_data_.erase(iter);
   }
 }
 
 void DeviceInfoService::OnProviderInitialized() {
   // TODO(skym): Do we need this?
 }
 
 }  // namespace sync_driver_v2