Remove ScopedVector from base::JSONValueConverter

chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc

 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 
 #include <stdint.h>
 
 #include <unordered_map>
 #include <utility>
@@ skipping 444 matching lines @@
     FileDetails* details = file->mutable_details();
     details->set_md5(
         "md5_value_" + base::Int64ToString(next_md5_sequence_number_++));
     details->set_change_id(++current_change_id_);
   }
 
   void ApplyNoopChangeToMetadata(FileMetadata* file) {
     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) {
     PutFileMetadataToDB(file, db);
     return db->Commit();
   }
 
   leveldb::Status PutTrackerToDB(LevelDBWrapper* db,
                                  const FileTracker& tracker) {
     PutFileTrackerToDB(tracker, db);
@@ skipping 101 matching lines @@
 
   SyncStatusCode EnableApp(const std::string& app_id) {
     return metadata_database_->EnableApp(app_id);
   }
 
   SyncStatusCode UnregisterApp(const std::string& app_id) {
     return metadata_database_->UnregisterApp(app_id);
   }
 
   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));
   }
 
   SyncStatusCode PopulateFolder(const std::string& folder_id,
                                 const FileIDList& listed_children) {
     return metadata_database_->PopulateFolderByChildList(
         folder_id, listed_children);
   }
 
   SyncStatusCode UpdateTracker(const FileTracker& tracker) {
     return metadata_database_->UpdateTracker(
         tracker.tracker_id(), tracker.synced_details());
   }
 
   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);
   }
 
   void ResetTrackerID(FileTracker* tracker) {
     tracker->set_tracker_id(GetTrackerIDByFileID(tracker->file_id()));
   }
 
   int64_t current_change_id() const { return current_change_id_; }
 
@@ skipping 289 matching lines @@
   EXPECT_EQ(SYNC_STATUS_OK, InitializeMetadataDatabase());
 
   ApplyRenameChangeToMetadata("renamed", &renamed_file.metadata);
   ApplyReorganizeChangeToMetadata(folder.metadata.file_id(),
                                   &reorganized_file.metadata);
   ApplyContentChangeToMetadata(&updated_file.metadata);
 
   // 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(
       CreateChangeResourceFromMetadata(reorganized_file.metadata), &changes);
   PushToChangeList(
       CreateChangeResourceFromMetadata(updated_file.metadata), &changes);
   PushToChangeList(
       CreateChangeResourceFromMetadata(noop_file.metadata), &changes);
   PushToChangeList(
       CreateChangeResourceFromMetadata(new_file.metadata), &changes);
@@ skipping 183 matching lines @@
 
   const TrackedFile* tracked_files[] = {
     &sync_root, &app_root
   };
 
   std::unique_ptr<google_apis::FileResource> sync_root_folder(
       CreateFileResourceFromMetadata(sync_root.metadata));
   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(
       current_change_id(),
       *sync_root_folder,
       app_root_folders));
 
   ResetTrackerID(&sync_root.tracker);
   ResetTrackerID(&app_root.tracker);
   app_root.tracker.set_parent_tracker_id(sync_root.tracker.tracker_id());
@@ skipping 31 matching lines @@
   EXPECT_TRUE(file->HasKey("details"));
 
   ASSERT_TRUE(files->GetDictionary(1, &file));
   EXPECT_TRUE(file->GetString("title", &str) && str == "file_0");
   EXPECT_TRUE(file->GetString("type", &str) && str == "file");
   EXPECT_TRUE(file->HasKey("details"));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system