Index: components/sync/device_info/device_info_sync_service.cc |
diff --git a/components/sync/device_info/device_info_sync_service.cc b/components/sync/device_info/device_info_sync_service.cc |
index 2767886d347b3f98f3d1735a3846cc8799a697cb..5568e4ecd76b29bc1b746e24588b13a48b8cec67 100644 |
--- a/components/sync/device_info/device_info_sync_service.cc |
+++ b/components/sync/device_info/device_info_sync_service.cc |
@@ -210,12 +210,13 @@ std::unique_ptr<DeviceInfo> DeviceInfoSyncService::GetDeviceInfo( |
return base::WrapUnique(CreateDeviceInfo(iter->second)); |
} |
-ScopedVector<DeviceInfo> DeviceInfoSyncService::GetAllDeviceInfo() const { |
- ScopedVector<DeviceInfo> list; |
+std::vector<std::unique_ptr<DeviceInfo>> |
+DeviceInfoSyncService::GetAllDeviceInfo() const { |
+ std::vector<std::unique_ptr<DeviceInfo>> list; |
for (SyncDataMap::const_iterator iter = all_data_.begin(); |
iter != all_data_.end(); ++iter) { |
- list.push_back(CreateDeviceInfo(iter->second)); |
+ list.push_back(base::WrapUnique(CreateDeviceInfo(iter->second))); |
} |
return list; |