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

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database.cc

Issue 2613223002: Remove ScopedVector from base::JSONValueConverter (Closed)
Patch Set: Created 3 years, 11 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: chrome/browser/sync_file_system/drive_backend/metadata_database.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 0b1e11ebe848510922e7ebb784fae27b09dcd1f4..84436d6966cbfea4c1114123827c20f15459647c 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -622,7 +622,8 @@ bool MetadataDatabase::HasSyncRoot() const {
SyncStatusCode MetadataDatabase::PopulateInitialData(
int64_t largest_change_id,
const google_apis::FileResource& sync_root_folder,
- const ScopedVector<google_apis::FileResource>& app_root_folders) {
+ const std::vector<std::unique_ptr<google_apis::FileResource>>&
+ app_root_folders) {
index_->SetLargestChangeID(largest_change_id);
UpdateLargestKnownChangeID(largest_change_id);
@@ -889,7 +890,7 @@ bool MetadataDatabase::FindNearestActiveAncestor(
SyncStatusCode MetadataDatabase::UpdateByChangeList(
int64_t largest_change_id,
- ScopedVector<google_apis::ChangeResource> changes) {
+ std::vector<std::unique_ptr<google_apis::ChangeResource>> changes) {
DCHECK_LE(index_->GetLargestChangeID(), largest_change_id);
for (size_t i = 0; i < changes.size(); ++i) {
@@ -918,7 +919,7 @@ SyncStatusCode MetadataDatabase::UpdateByFileResource(
}
SyncStatusCode MetadataDatabase::UpdateByFileResourceList(
- ScopedVector<google_apis::FileResource> resources) {
+ std::vector<std::unique_ptr<google_apis::FileResource>> resources) {
for (size_t i = 0; i < resources.size(); ++i) {
std::unique_ptr<FileMetadata> metadata(CreateFileMetadataFromFileResource(
GetLargestKnownChangeID(), *resources[i]));

Powered by Google App Engine
This is Rietveld 408576698