Remove ScopedVector from base::JSONValueConverter

chrome/browser/sync_file_system/drive_backend/metadata_database_index.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/metadata_database_index.h"
 
 #include <tuple>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 80 matching lines @@
 
     std::string file_id;
     if (RemovePrefix(key, kFileMetadataKeyPrefix, &file_id)) {
       std::unique_ptr<FileMetadata> metadata(new FileMetadata);
       if (!metadata->ParseFromString(itr->value().ToString())) {
         util::Log(logging::LOG_WARNING, FROM_HERE,
                   "Failed to parse a FileMetadata");
         continue;
       }
 
-      contents->file_metadata.push_back(metadata.release());
+      contents->file_metadata.push_back(std::move(metadata));
       continue;
     }
 
     std::string tracker_id_str;
     if (RemovePrefix(key, kFileTrackerKeyPrefix, &tracker_id_str)) {
       int64_t tracker_id = 0;
       if (!base::StringToInt64(tracker_id_str, &tracker_id)) {
         util::Log(logging::LOG_WARNING, FROM_HERE,
                   "Failed to parse TrackerID");
         continue;
       }
 
       std::unique_ptr<FileTracker> tracker(new FileTracker);
       if (!tracker->ParseFromString(itr->value().ToString())) {
         util::Log(logging::LOG_WARNING, FROM_HERE,
                   "Failed to parse a Tracker");
         continue;
       }
-      contents->file_trackers.push_back(tracker.release());
+      contents->file_trackers.push_back(std::move(tracker));
       continue;
     }
   }
 }
 
 void RemoveUnreachableItemsFromDB(DatabaseContents* contents,
                                   int64_t sync_root_tracker_id,
                                   LevelDBWrapper* db) {
   typedef std::map<int64_t, std::set<int64_t>> ChildTrackersByParent;
   ChildTrackersByParent trackers_by_parent;
@@ skipping 30 matching lines @@
       NOTREACHED();
       continue;
     }
 
     AppendContents(
         LookUpMap(trackers_by_parent, tracker_id, std::set<int64_t>()),
         &pending);
   }
 
   // Delete all unreachable trackers.
-  ScopedVector<FileTracker> reachable_trackers;
+  std::vector<std::unique_ptr<FileTracker>> reachable_trackers;
   for (size_t i = 0; i < contents->file_trackers.size(); ++i) {
-    FileTracker* tracker = contents->file_trackers[i];
+    FileTracker* tracker = contents->file_trackers[i].get();
     if (base::ContainsKey(visited_trackers, tracker->tracker_id())) {
-      reachable_trackers.push_back(tracker);
-      contents->file_trackers[i] = nullptr;
+      reachable_trackers.push_back(base::WrapUnique(tracker));
+      contents->file_trackers[i].release();

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

Wrapping an existing unique_ptr and then releasing it gives me the willies.

Perhaps do:

for (...
  std::unique_ptr<FileTracker>& tracker = contents->file_trackers[i];
  if (base::ContainsKey...
    reachable_trackers.push_back(std::move(tracker));
  else ...

The move will clear it out of the old pointer, and it's more clear in the code
that we're moving ownership.

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

Done.

     } else {
       PutFileTrackerDeletionToDB(tracker->tracker_id(), db);
     }
   }
   contents->file_trackers = std::move(reachable_trackers);
 
   // List all |file_id| referred by a tracker.
   base::hash_set<std::string> referred_file_ids;
   for (size_t i = 0; i < contents->file_trackers.size(); ++i)
     referred_file_ids.insert(contents->file_trackers[i]->file_id());
 
   // Delete all unreferred metadata.
-  ScopedVector<FileMetadata> referred_file_metadata;
+  std::vector<std::unique_ptr<FileMetadata>> referred_file_metadata;
   for (size_t i = 0; i < contents->file_metadata.size(); ++i) {
-    FileMetadata* metadata = contents->file_metadata[i];
+    FileMetadata* metadata = contents->file_metadata[i].get();
     if (base::ContainsKey(referred_file_ids, metadata->file_id())) {
-      referred_file_metadata.push_back(metadata);
-      contents->file_metadata[i] = nullptr;
+      referred_file_metadata.push_back(base::WrapUnique(metadata));
+      contents->file_metadata[i].release();

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

Same here.

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

Done.

     } else {
       PutFileMetadataDeletionToDB(metadata->file_id(), db);
     }
   }
   contents->file_metadata = std::move(referred_file_metadata);
 }
 
 }  // namespace
 
 // static
@@ skipping 26 matching lines @@
   index->Initialize(base::WrapUnique(new ServiceMetadata), contents);
   return index;
 }
 
 void MetadataDatabaseIndex::Initialize(
     std::unique_ptr<ServiceMetadata> service_metadata,
     DatabaseContents* contents) {
   service_metadata_ = std::move(service_metadata);
 
   for (size_t i = 0; i < contents->file_metadata.size(); ++i)
-    StoreFileMetadata(base::WrapUnique(contents->file_metadata[i]));
-  contents->file_metadata.weak_clear();
+    StoreFileMetadata(std::move(contents->file_metadata[i]));
+  contents->file_metadata.clear();
 
   for (size_t i = 0; i < contents->file_trackers.size(); ++i)
-    StoreFileTracker(base::WrapUnique(contents->file_trackers[i]));
-  contents->file_trackers.weak_clear();
+    StoreFileTracker(std::move(contents->file_trackers[i]));
+  contents->file_trackers.clear();
 
   UMA_HISTOGRAM_COUNTS("SyncFileSystem.MetadataNumber", metadata_by_id_.size());
   UMA_HISTOGRAM_COUNTS("SyncFileSystem.TrackerNumber", tracker_by_id_.size());
   UMA_HISTOGRAM_COUNTS_100("SyncFileSystem.RegisteredAppNumber",
                            app_root_by_app_id_.size());
 }
 
 MetadataDatabaseIndex::MetadataDatabaseIndex(LevelDBWrapper* db) : db_(db) {}
 MetadataDatabaseIndex::~MetadataDatabaseIndex() {}
 
@@ skipping 509 matching lines @@
 
     DVLOG(3) << "  Remove from dirty_trackers_: " << tracker_id;
     dirty_trackers_.erase(tracker_id);
 
     demoted_dirty_trackers_.erase(tracker_id);
   }
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system