Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4289)

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc

Issue 610223002: [SyncFS] Use nullptr instead of NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698