Switch to standard integer types in chrome/browser/, part 4 of 4.

chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc

Index: chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
index d33e1912dbe60a3defdc7231bcabde41cf04554d..df4dcf627d225b7a0963ccedcad8fe4f7b3c0a32 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
@@ -24,7 +24,7 @@
 //
 // NOTE
 // - Entries are sorted by keys.
-// - int64 value is serialized as a string by base::Int64ToString().
+// - int64_t value is serialized as a string by base::Int64ToString().
 // - ServiceMetadata, FileMetadata, and FileTracker values are serialized
 //   as a string by SerializeToString() of protocol buffers.
 //
@@ -42,15 +42,14 @@
 //   value: <FileMetadata 'metadata'>
 //
 //   # Trackers of local file updates
-//   key: "TRACKER: " + <int64 'tracker_id'>
+//   key: "TRACKER: " + <int64_t 'tracker_id'>
 //   value: <FileTracker 'tracker'>
 
 namespace sync_file_system {
 namespace drive_backend {
 
 ParentIDAndTitle::ParentIDAndTitle() : parent_id(0) {}
-ParentIDAndTitle::ParentIDAndTitle(int64 parent_id,
-                                   const std::string& title)
+ParentIDAndTitle::ParentIDAndTitle(int64_t parent_id, const std::string& title)
     : parent_id(parent_id), title(title) {}
 
 bool operator==(const ParentIDAndTitle& left, const ParentIDAndTitle& right) {
@@ -102,7 +101,7 @@ void ReadDatabaseContents(LevelDBWrapper* db, DatabaseContents* contents) {
 
     std::string tracker_id_str;
     if (RemovePrefix(key, kFileTrackerKeyPrefix, &tracker_id_str)) {
-      int64 tracker_id = 0;
+      int64_t tracker_id = 0;
       if (!base::StringToInt64(tracker_id_str, &tracker_id)) {
         util::Log(logging::LOG_WARNING, FROM_HERE,
                   "Failed to parse TrackerID");
@@ -122,16 +121,16 @@ void ReadDatabaseContents(LevelDBWrapper* db, DatabaseContents* contents) {
 }
 
 void RemoveUnreachableItemsFromDB(DatabaseContents* contents,
-                                  int64 sync_root_tracker_id,
+                                  int64_t sync_root_tracker_id,
                                   LevelDBWrapper* db) {
-  typedef std::map<int64, std::set<int64> > ChildTrackersByParent;
+  typedef std::map<int64_t, std::set<int64_t>> ChildTrackersByParent;
   ChildTrackersByParent trackers_by_parent;
 
   // Set up links from parent tracker to child trackers.
   for (size_t i = 0; i < contents->file_trackers.size(); ++i) {
     const FileTracker& tracker = *contents->file_trackers[i];
-    int64 parent_tracker_id = tracker.parent_tracker_id();
-    int64 tracker_id = tracker.tracker_id();
+    int64_t parent_tracker_id = tracker.parent_tracker_id();
+    int64_t tracker_id = tracker.tracker_id();
 
     trackers_by_parent[parent_tracker_id].insert(tracker_id);
   }
@@ -144,14 +143,14 @@ void RemoveUnreachableItemsFromDB(DatabaseContents* contents,
       trackers_by_parent.erase(tracker.tracker_id());
   }
 
-  std::vector<int64> pending;
+  std::vector<int64_t> pending;
   if (sync_root_tracker_id != kInvalidTrackerID)
     pending.push_back(sync_root_tracker_id);
 
   // Traverse tracker tree from sync-root.
-  std::set<int64> visited_trackers;
+  std::set<int64_t> visited_trackers;
   while (!pending.empty()) {
-    int64 tracker_id = pending.back();
+    int64_t tracker_id = pending.back();
     DCHECK_NE(kInvalidTrackerID, tracker_id);
     pending.pop_back();
 
@@ -161,7 +160,7 @@ void RemoveUnreachableItemsFromDB(DatabaseContents* contents,
     }
 
     AppendContents(
-        LookUpMap(trackers_by_parent, tracker_id, std::set<int64>()),
+        LookUpMap(trackers_by_parent, tracker_id, std::set<int64_t>()),
         &pending);
   }
 
@@ -267,8 +266,8 @@ bool MetadataDatabaseIndex::GetFileMetadata(
   return true;
 }
 
-bool MetadataDatabaseIndex::GetFileTracker(
-    int64 tracker_id, FileTracker* tracker) const {
+bool MetadataDatabaseIndex::GetFileTracker(int64_t tracker_id,
+                                           FileTracker* tracker) const {
   FileTracker* identified = tracker_by_id_.get(tracker_id);
   if (!identified)
     return false;
@@ -297,7 +296,7 @@ void MetadataDatabaseIndex::StoreFileTracker(
     return;
   }
 
-  int64 tracker_id = tracker->tracker_id();
+  int64_t tracker_id = tracker->tracker_id();
   FileTracker* old_tracker = tracker_by_id_.get(tracker_id);
 
   if (!old_tracker) {
@@ -326,7 +325,7 @@ void MetadataDatabaseIndex::RemoveFileMetadata(const std::string& file_id) {
   metadata_by_id_.erase(file_id);
 }
 
-void MetadataDatabaseIndex::RemoveFileTracker(int64 tracker_id) {
+void MetadataDatabaseIndex::RemoveFileTracker(int64_t tracker_id) {
   PutFileTrackerDeletionToDB(tracker_id, db_);
 
   FileTracker* tracker = tracker_by_id_.get(tracker_id);
@@ -351,13 +350,13 @@ TrackerIDSet MetadataDatabaseIndex::GetFileTrackerIDsByFileID(
   return FindItem(trackers_by_file_id_, file_id);
 }
 
-int64 MetadataDatabaseIndex::GetAppRootTracker(
+int64_t MetadataDatabaseIndex::GetAppRootTracker(
     const std::string& app_id) const {
   return FindItem(app_root_by_app_id_, app_id);
 }
 
 TrackerIDSet MetadataDatabaseIndex::GetFileTrackerIDsByParentAndTitle(
-    int64 parent_tracker_id,
+    int64_t parent_tracker_id,
     const std::string& title) const {
   TrackerIDsByParentAndTitle::const_iterator found =
       trackers_by_parent_and_title_.find(parent_tracker_id);
@@ -366,9 +365,9 @@ TrackerIDSet MetadataDatabaseIndex::GetFileTrackerIDsByParentAndTitle(
   return FindItem(found->second, title);
 }
 
-std::vector<int64> MetadataDatabaseIndex::GetFileTrackerIDsByParent(
-    int64 parent_tracker_id) const {
-  std::vector<int64> result;
+std::vector<int64_t> MetadataDatabaseIndex::GetFileTrackerIDsByParent(
+    int64_t parent_tracker_id) const {
+  std::vector<int64_t> result;
   TrackerIDsByParentAndTitle::const_iterator found =
       trackers_by_parent_and_title_.find(parent_tracker_id);
   if (found == trackers_by_parent_and_title_.end())
@@ -394,13 +393,13 @@ ParentIDAndTitle MetadataDatabaseIndex::PickMultiBackingFilePath() const {
   return *multi_backing_file_paths_.begin();
 }
 
-int64 MetadataDatabaseIndex::PickDirtyTracker() const {
+int64_t MetadataDatabaseIndex::PickDirtyTracker() const {
   if (dirty_trackers_.empty())
     return kInvalidTrackerID;
   return *dirty_trackers_.begin();
 }
 
-void MetadataDatabaseIndex::DemoteDirtyTracker(int64 tracker_id) {
+void MetadataDatabaseIndex::DemoteDirtyTracker(int64_t tracker_id) {
   if (dirty_trackers_.erase(tracker_id))
     demoted_dirty_trackers_.insert(tracker_id);
 }
@@ -409,12 +408,12 @@ bool MetadataDatabaseIndex::HasDemotedDirtyTracker() const {
   return !demoted_dirty_trackers_.empty();
 }
 
-bool MetadataDatabaseIndex::IsDemotedDirtyTracker(int64 tracker_id) const {
+bool MetadataDatabaseIndex::IsDemotedDirtyTracker(int64_t tracker_id) const {
   return demoted_dirty_trackers_.find(tracker_id) !=
       demoted_dirty_trackers_.end();
 }
 
-void MetadataDatabaseIndex::PromoteDemotedDirtyTracker(int64 tracker_id) {
+void MetadataDatabaseIndex::PromoteDemotedDirtyTracker(int64_t tracker_id) {
   if (demoted_dirty_trackers_.erase(tracker_id) == 1)
     dirty_trackers_.insert(tracker_id);
 }
@@ -444,20 +443,18 @@ void MetadataDatabaseIndex::SetSyncRootRevalidated() const {
   PutServiceMetadataToDB(*service_metadata_, db_);
 }
 
-void MetadataDatabaseIndex::SetSyncRootTrackerID(
-    int64 sync_root_id) const {
+void MetadataDatabaseIndex::SetSyncRootTrackerID(int64_t sync_root_id) const {
   service_metadata_->set_sync_root_tracker_id(sync_root_id);
   PutServiceMetadataToDB(*service_metadata_, db_);
 }
 
 void MetadataDatabaseIndex::SetLargestChangeID(
-    int64 largest_change_id) const {
+    int64_t largest_change_id) const {
   service_metadata_->set_largest_change_id(largest_change_id);
   PutServiceMetadataToDB(*service_metadata_, db_);
 }
 
-void MetadataDatabaseIndex::SetNextTrackerID(
-    int64 next_tracker_id) const {
+void MetadataDatabaseIndex::SetNextTrackerID(int64_t next_tracker_id) const {
   service_metadata_->set_next_tracker_id(next_tracker_id);
   PutServiceMetadataToDB(*service_metadata_, db_);
 }
@@ -467,19 +464,19 @@ bool MetadataDatabaseIndex::IsSyncRootRevalidated() const {
       service_metadata_->sync_root_revalidated();
 }
 
-int64 MetadataDatabaseIndex::GetSyncRootTrackerID() const {
+int64_t MetadataDatabaseIndex::GetSyncRootTrackerID() const {
   if (!service_metadata_->has_sync_root_tracker_id())
     return kInvalidTrackerID;
   return service_metadata_->sync_root_tracker_id();
 }
 
-int64 MetadataDatabaseIndex::GetLargestChangeID() const {
+int64_t MetadataDatabaseIndex::GetLargestChangeID() const {
   if (!service_metadata_->has_largest_change_id())
     return kInvalidTrackerID;
   return service_metadata_->largest_change_id();
 }
 
-int64 MetadataDatabaseIndex::GetNextTrackerID() const {
+int64_t MetadataDatabaseIndex::GetNextTrackerID() const {
   if (!service_metadata_->has_next_tracker_id()) {
     NOTREACHED();
     return kInvalidTrackerID;
@@ -496,8 +493,8 @@ std::vector<std::string> MetadataDatabaseIndex::GetRegisteredAppIDs() const {
   return result;
 }
 
-std::vector<int64> MetadataDatabaseIndex::GetAllTrackerIDs() const {
-  std::vector<int64> result;
+std::vector<int64_t> MetadataDatabaseIndex::GetAllTrackerIDs() const {
+  std::vector<int64_t> result;
   for (TrackerByID::const_iterator itr = tracker_by_id_.begin();
        itr != tracker_by_id_.end(); ++itr) {
     result.push_back(itr->first);
@@ -615,7 +612,7 @@ void MetadataDatabaseIndex::RemoveFromFileIDIndexes(
 
 void MetadataDatabaseIndex::AddToPathIndexes(
     const FileTracker& new_tracker) {
-  int64 parent = new_tracker.parent_tracker_id();
+  int64_t parent = new_tracker.parent_tracker_id();
   std::string title = GetTrackerTitle(new_tracker);
 
   DVLOG(3) << "  Add to trackers_by_parent_and_title_: "
@@ -640,8 +637,8 @@ void MetadataDatabaseIndex::UpdateInPathIndexes(
   DCHECK(GetTrackerTitle(old_tracker) == GetTrackerTitle(new_tracker) ||
          !old_tracker.has_synced_details());
 
-  int64 tracker_id = new_tracker.tracker_id();
-  int64 parent = new_tracker.parent_tracker_id();
+  int64_t tracker_id = new_tracker.tracker_id();
+  int64_t parent = new_tracker.parent_tracker_id();
   std::string old_title = GetTrackerTitle(old_tracker);
   std::string title = GetTrackerTitle(new_tracker);
 
@@ -693,8 +690,8 @@ void MetadataDatabaseIndex::UpdateInPathIndexes(
 
 void MetadataDatabaseIndex::RemoveFromPathIndexes(
     const FileTracker& tracker) {
-  int64 tracker_id = tracker.tracker_id();
-  int64 parent = tracker.parent_tracker_id();
+  int64_t tracker_id = tracker.tracker_id();
+  int64_t parent = tracker.parent_tracker_id();
   std::string title = GetTrackerTitle(tracker);
 
   DCHECK(ContainsKey(trackers_by_parent_and_title_, parent));
@@ -737,7 +734,7 @@ void MetadataDatabaseIndex::UpdateInDirtyTrackerIndexes(
     const FileTracker& new_tracker) {
   DCHECK_EQ(old_tracker.tracker_id(), new_tracker.tracker_id());
 
-  int64 tracker_id = new_tracker.tracker_id();
+  int64_t tracker_id = new_tracker.tracker_id();
   if (old_tracker.dirty() && !new_tracker.dirty()) {
     DCHECK(ContainsKey(dirty_trackers_, tracker_id) ||
            ContainsKey(demoted_dirty_trackers_, tracker_id));
@@ -759,7 +756,7 @@ void MetadataDatabaseIndex::UpdateInDirtyTrackerIndexes(
 void MetadataDatabaseIndex::RemoveFromDirtyTrackerIndexes(
     const FileTracker& tracker) {
   if (tracker.dirty()) {
-    int64 tracker_id = tracker.tracker_id();
+    int64_t tracker_id = tracker.tracker_id();
     DCHECK(ContainsKey(dirty_trackers_, tracker_id) ||
            ContainsKey(demoted_dirty_trackers_, tracker_id));