Index: chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc |
index 23b809d3510759df2500a3c5ce2cd4917c27e962..6df37833de9811460b5baca6337f6591e10bc8dc 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc |
@@ -154,7 +154,7 @@ void RemoveUnreachableItems(LevelDBWrapper* db, int64 sync_root_tracker_id) { |
std::set<int64> inactive_trackers; |
scoped_ptr<LevelDBWrapper::Iterator> itr = db->NewIterator(); |
for (itr->Seek(kFileTrackerKeyPrefix); itr->Valid(); itr->Next()) { |
- if (!RemovePrefix(itr->key().ToString(), kFileTrackerKeyPrefix, NULL)) |
+ if (!RemovePrefix(itr->key().ToString(), kFileTrackerKeyPrefix, nullptr)) |
break; |
scoped_ptr<FileTracker> tracker(new FileTracker); |
@@ -207,7 +207,7 @@ void RemoveUnreachableItems(LevelDBWrapper* db, int64 sync_root_tracker_id) { |
{ |
scoped_ptr<LevelDBWrapper::Iterator> itr = db->NewIterator(); |
for (itr->Seek(kFileTrackerKeyPrefix); itr->Valid(); itr->Next()) { |
- if (!RemovePrefix(itr->key().ToString(), kFileTrackerKeyPrefix, NULL)) |
+ if (!RemovePrefix(itr->key().ToString(), kFileTrackerKeyPrefix, nullptr)) |
break; |
scoped_ptr<FileTracker> tracker(new FileTracker); |
@@ -229,7 +229,7 @@ void RemoveUnreachableItems(LevelDBWrapper* db, int64 sync_root_tracker_id) { |
{ |
scoped_ptr<LevelDBWrapper::Iterator> itr = db->NewIterator(); |
for (itr->Seek(kFileMetadataKeyPrefix); itr->Valid(); itr->Next()) { |
- if (!RemovePrefix(itr->key().ToString(), kFileMetadataKeyPrefix, NULL)) |
+ if (!RemovePrefix(itr->key().ToString(), kFileMetadataKeyPrefix, nullptr)) |
break; |
scoped_ptr<FileMetadata> metadata(new FileMetadata); |
@@ -353,7 +353,6 @@ void MetadataDatabaseIndexOnDisk::StoreFileTracker( |
UpdateInFileIDIndexes(old_tracker, *tracker); |
UpdateInPathIndexes(old_tracker, *tracker); |
UpdateInDirtyTrackerIndexes(old_tracker, *tracker); |
- |
} |
PutFileTrackerToDB(*tracker, db_); |
@@ -668,7 +667,7 @@ int64 MetadataDatabaseIndexOnDisk::BuildTrackerIndexes() { |
scoped_ptr<LevelDBWrapper::Iterator> itr(db_->NewIterator()); |
for (itr->Seek(kFileTrackerKeyPrefix); itr->Valid(); itr->Next()) { |
- if (!RemovePrefix(itr->key().ToString(), kFileTrackerKeyPrefix, NULL)) |
+ if (!RemovePrefix(itr->key().ToString(), kFileTrackerKeyPrefix, nullptr)) |
break; |
FileTracker tracker; |