Remove ScopedVector from base::JSONValueConverter

chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc

 // Copyright 2014 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/fake_drive_service_helper.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 199 matching lines @@
     std::string* sync_root_folder_id) {
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   std::unique_ptr<FileList> resource_list;
   fake_drive_service_->SearchByTitle(
       sync_root_folder_title_, std::string(),
       CreateResultReceiver(&error, &resource_list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)
     return error;
 
-  const ScopedVector<FileResource>& items = resource_list->items();
-  for (ScopedVector<FileResource>::const_iterator itr = items.begin();
-       itr != items.end(); ++itr) {
-    const FileResource& item = **itr;
-    if (item.parents().empty()) {
-      *sync_root_folder_id = item.file_id();
+  const std::vector<std::unique_ptr<FileResource>>& items =
+      resource_list->items();
+  for (const auto& item : items) {
+    if (item->parents().empty()) {
+      *sync_root_folder_id = item->file_id();
       return google_apis::HTTP_SUCCESS;
     }
   }
   return google_apis::HTTP_NOT_FOUND;
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::ListFilesInFolder(
     const std::string& folder_id,
-    ScopedVector<FileResource>* entries) {
+    std::vector<std::unique_ptr<FileResource>>* entries) {
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   std::unique_ptr<FileList> list;
   fake_drive_service_->GetFileListInDirectory(
       folder_id,
       CreateResultReceiver(&error, &list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)
     return error;
 
   return CompleteListing(std::move(list), entries);
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::SearchByTitle(
     const std::string& folder_id,
     const std::string& title,
-    ScopedVector<FileResource>* entries) {
+    std::vector<std::unique_ptr<FileResource>>* entries) {
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   std::unique_ptr<FileList> list;
   fake_drive_service_->SearchByTitle(
       title, folder_id,
       CreateResultReceiver(&error, &list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)
     return error;
 
   return CompleteListing(std::move(list), entries);
@@ skipping 48 matching lines @@
     std::unique_ptr<AboutResource>* about_resource) {
   DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
   fake_drive_service_->GetAboutResource(
       CreateResultReceiver(&error, about_resource));
   base::RunLoop().RunUntilIdle();
   return error;
 }
 
 DriveApiErrorCode FakeDriveServiceHelper::CompleteListing(
     std::unique_ptr<FileList> list,
-    ScopedVector<FileResource>* entries) {
+    std::vector<std::unique_ptr<FileResource>>* entries) {
   while (true) {
     entries->reserve(entries->size() + list->items().size());
-    std::vector<FileResource*> tmp;
-    list->mutable_items()->release(&tmp);
-    for (std::vector<FileResource*>::const_iterator itr =
-             tmp.begin(); itr != tmp.end(); ++itr) {
-      entries->push_back(*itr);
-    }
+    std::move(list->mutable_items()->begin(), list->mutable_items()->end(),
+              std::back_inserter(*entries));

[Avi (use Gerrit), 2017/01/09 17:18:29]

Yay move to a back_inserter!

+    list->mutable_items()->clear();
 
     GURL next_feed = list->next_link();
     if (next_feed.is_empty())
       return google_apis::HTTP_SUCCESS;
 
     DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
     list.reset();
     fake_drive_service_->GetRemainingFileList(
         next_feed,
         CreateResultReceiver(&error, &list));
@@ skipping 13 matching lines @@
     const std::string& content) {
   base::FilePath temp_file;
   EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_, &temp_file));
   EXPECT_EQ(static_cast<int>(content.size()),
             base::WriteFile(temp_file, content.data(), content.size()));
   return temp_file;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system