Remove ScopedVector from base::JSONValueConverter

chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.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/sync_engine_initializer.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 162 matching lines @@
   }
 
   if (!file_list) {
     NOTREACHED();
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Got invalid resource list.");
     SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_FAILED);
     return;
   }
 
-  ScopedVector<google_apis::FileResource>* items = file_list->mutable_items();
-  for (ScopedVector<google_apis::FileResource>::iterator itr = items->begin();
-       itr != items->end(); ++itr) {
-    google_apis::FileResource* entry = *itr;
-
+  std::vector<std::unique_ptr<google_apis::FileResource>>* items =
+      file_list->mutable_items();
+  for (auto& entry : *items) {
     // Ignore deleted folder.
     if (entry->labels().is_trashed())
       continue;
 
     // Pick an orphaned folder or a direct child of the root folder and
     // ignore others.
     DCHECK(!root_folder_id_.empty());
     if (!HasNoParents(*entry) && !HasFolderAsParent(*entry, root_folder_id_))
       continue;
 
     if (entry->shared())
       continue;
 
     if (!sync_root_folder_ || LessOnCreationTime(*entry, *sync_root_folder_)) {
-      sync_root_folder_.reset(entry);
-      *itr = nullptr;
+      sync_root_folder_ = std::move(entry);
     }
   }
 
   set_used_network(true);
   // If there are more results, retrieve them.
   if (!file_list->next_link().is_empty()) {
     cancel_callback_ = sync_context_->GetDriveService()->GetRemainingFileList(
         file_list->next_link(),
         base::Bind(&SyncEngineInitializer::DidFindSyncRoot,
                    weak_ptr_factory_.GetWeakPtr(),
@@ skipping 100 matching lines @@
   }
 
   if (!file_list) {
     NOTREACHED();
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[Initialize] Got invalid initial app-root list.");
     SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_FAILED);
     return;
   }
 
-  ScopedVector<google_apis::FileResource>* new_entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>>* new_entries =
       file_list->mutable_items();
   app_root_folders_.insert(app_root_folders_.end(),
-                           new_entries->begin(), new_entries->end());
-  new_entries->weak_clear();
+                           std::make_move_iterator(new_entries->begin()),
+                           std::make_move_iterator(new_entries->end()));

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

Same question here about move + back_iterator and consistency.

[leonhsl(Using Gerrit), 2017/01/10 04:39:36]

Done.

+  new_entries->clear();
 
   set_used_network(true);
   if (!file_list->next_link().is_empty()) {
     cancel_callback_ =
         sync_context_->GetDriveService()->GetRemainingFileList(
             file_list->next_link(),
             base::Bind(&SyncEngineInitializer::DidListAppRootFolders,
                        weak_ptr_factory_.GetWeakPtr(), base::Passed(&token)));
     return;
   }
@@ skipping 14 matching lines @@
     return;
   }
 
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "[Initialize] Completed successfully.");
   SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_OK);
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system