Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: components/sync/device_info/device_info_sync_service.cc

Issue 2310683002: Remove most ScopedVector usage from c/b/extensions. (Closed)
Patch Set: remove scoped_vector includes Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
« no previous file with comments | « components/sync/device_info/device_info_sync_service.h ('k') | components/sync/device_info/device_info_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698