Index: chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
index e456d4ce74cd8e2903ddc6c2893c2f3d1e6cebad..5d6d331f7bbeecb6330af02e21962065641d881d 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
@@ -462,9 +462,10 @@ class MetadataDatabaseTest : public testing::TestWithParam<bool> { |
file->mutable_details()->set_change_id(++current_change_id_); |
} |
- void PushToChangeList(std::unique_ptr<google_apis::ChangeResource> change, |
- ScopedVector<google_apis::ChangeResource>* changes) { |
- changes->push_back(change.release()); |
+ void PushToChangeList( |
+ std::unique_ptr<google_apis::ChangeResource> change, |
+ std::vector<std::unique_ptr<google_apis::ChangeResource>>* changes) { |
+ changes->push_back(std::move(change)); |
} |
leveldb::Status PutFileToDB(LevelDBWrapper* db, const FileMetadata& file) { |
@@ -586,7 +587,7 @@ class MetadataDatabaseTest : public testing::TestWithParam<bool> { |
} |
SyncStatusCode UpdateByChangeList( |
- ScopedVector<google_apis::ChangeResource> changes) { |
+ std::vector<std::unique_ptr<google_apis::ChangeResource>> changes) { |
return metadata_database_->UpdateByChangeList(current_change_id_, |
std::move(changes)); |
} |
@@ -605,7 +606,8 @@ class MetadataDatabaseTest : public testing::TestWithParam<bool> { |
SyncStatusCode 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) { |
return metadata_database_->PopulateInitialData( |
largest_change_id, sync_root_folder, app_root_folders); |
} |
@@ -915,7 +917,7 @@ TEST_P(MetadataDatabaseTest, UpdateByChangeListTest) { |
// Update change ID. |
ApplyNoopChangeToMetadata(&noop_file.metadata); |
- ScopedVector<google_apis::ChangeResource> changes; |
+ std::vector<std::unique_ptr<google_apis::ChangeResource>> changes; |
PushToChangeList( |
CreateChangeResourceFromMetadata(renamed_file.metadata), &changes); |
PushToChangeList( |
@@ -1119,8 +1121,8 @@ TEST_P(MetadataDatabaseTest, PopulateInitialDataTest) { |
std::unique_ptr<google_apis::FileResource> app_root_folder( |
CreateFileResourceFromMetadata(app_root.metadata)); |
- ScopedVector<google_apis::FileResource> app_root_folders; |
- app_root_folders.push_back(app_root_folder.release()); |
+ std::vector<std::unique_ptr<google_apis::FileResource>> app_root_folders; |
+ app_root_folders.push_back(std::move(app_root_folder)); |
EXPECT_EQ(SYNC_STATUS_OK, InitializeMetadataDatabase()); |
EXPECT_EQ(SYNC_STATUS_OK, PopulateInitialData( |