Convert Pass()→std::move() in //chrome/browser/ui

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/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
@@ skipping 150 matching lines @@
   ScopedVector<FileTracker> reachable_trackers;
   for (size_t i = 0; i < contents->file_trackers.size(); ++i) {
     FileTracker* tracker = contents->file_trackers[i];
     if (ContainsKey(visited_trackers, tracker->tracker_id())) {
       reachable_trackers.push_back(tracker);
       contents->file_trackers[i] = nullptr;
     } else {
       PutFileTrackerDeletionToDB(tracker->tracker_id(), db);
     }
   }
-  contents->file_trackers = reachable_trackers.Pass();
+  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;
   for (size_t i = 0; i < contents->file_metadata.size(); ++i) {
     FileMetadata* metadata = contents->file_metadata[i];
     if (ContainsKey(referred_file_ids, metadata->file_id())) {
       referred_file_metadata.push_back(metadata);
       contents->file_metadata[i] = nullptr;
     } else {
       PutFileMetadataDeletionToDB(metadata->file_id(), db);
     }
   }
-  contents->file_metadata = referred_file_metadata.Pass();
+  contents->file_metadata = std::move(referred_file_metadata);
 }
 
 }  // namespace
 
 // static
 scoped_ptr<MetadataDatabaseIndex>
 MetadataDatabaseIndex::Create(LevelDBWrapper* db) {
   DCHECK(db);
 
   scoped_ptr<ServiceMetadata> service_metadata = InitializeServiceMetadata(db);
   if (!service_metadata)
     return scoped_ptr<MetadataDatabaseIndex>();
 
   DatabaseContents contents;
   PutVersionToDB(kCurrentDatabaseVersion, db);
   ReadDatabaseContents(db, &contents);
   RemoveUnreachableItemsFromDB(&contents,
                                service_metadata->sync_root_tracker_id(),
                                db);
 
   scoped_ptr<MetadataDatabaseIndex> index(new MetadataDatabaseIndex(db));
-  index->Initialize(service_metadata.Pass(), &contents);
-  return index.Pass();
+  index->Initialize(std::move(service_metadata), &contents);
+  return index;
 }
 
 // static
 scoped_ptr<MetadataDatabaseIndex>
 MetadataDatabaseIndex::CreateForTesting(DatabaseContents* contents,
                                         LevelDBWrapper* db) {
   scoped_ptr<MetadataDatabaseIndex> index(new MetadataDatabaseIndex(db));
   index->Initialize(make_scoped_ptr(new ServiceMetadata), contents);
-  return index.Pass();
+  return index;
 }
 
 void MetadataDatabaseIndex::Initialize(
     scoped_ptr<ServiceMetadata> service_metadata,
     DatabaseContents* contents) {
-  service_metadata_ = service_metadata.Pass();
+  service_metadata_ = std::move(service_metadata);
 
   for (size_t i = 0; i < contents->file_metadata.size(); ++i)
     StoreFileMetadata(make_scoped_ptr(contents->file_metadata[i]));
   contents->file_metadata.weak_clear();
 
   for (size_t i = 0; i < contents->file_trackers.size(); ++i)
     StoreFileTracker(make_scoped_ptr(contents->file_trackers[i]));
   contents->file_trackers.weak_clear();
 
   UMA_HISTOGRAM_COUNTS("SyncFileSystem.MetadataNumber", metadata_by_id_.size());
@@ skipping 33 matching lines @@
 
 void MetadataDatabaseIndex::StoreFileMetadata(
     scoped_ptr<FileMetadata> metadata) {
   PutFileMetadataToDB(*metadata.get(), db_);
   if (!metadata) {
     NOTREACHED();
     return;
   }
 
   std::string file_id = metadata->file_id();
-  metadata_by_id_.set(file_id, metadata.Pass());
+  metadata_by_id_.set(file_id, std::move(metadata));
 }
 
 void MetadataDatabaseIndex::StoreFileTracker(
     scoped_ptr<FileTracker> tracker) {
   PutFileTrackerToDB(*tracker.get(), db_);
   if (!tracker) {
     NOTREACHED();
     return;
   }
 
@@ skipping 11 matching lines @@
   } else {
     DVLOG(3) << "Updating tracker: " << tracker->tracker_id()
              << " " << GetTrackerTitle(*tracker);
 
     UpdateInAppIDIndex(*old_tracker, *tracker);
     UpdateInPathIndexes(*old_tracker, *tracker);
     UpdateInFileIDIndexes(*old_tracker, *tracker);
     UpdateInDirtyTrackerIndexes(*old_tracker, *tracker);
   }
 
-  tracker_by_id_.set(tracker_id, tracker.Pass());
+  tracker_by_id_.set(tracker_id, std::move(tracker));
 }
 
 void MetadataDatabaseIndex::RemoveFileMetadata(const std::string& file_id) {
   PutFileMetadataDeletionToDB(file_id, db_);
   metadata_by_id_.erase(file_id);
 }
 
 void MetadataDatabaseIndex::RemoveFileTracker(int64_t tracker_id) {
   PutFileTrackerDeletionToDB(tracker_id, db_);
 
@@ skipping 431 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