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

Unified Diff: chrome/browser/sync_file_system/local/canned_syncable_file_system.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/local/canned_syncable_file_system.cc
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
index d6bdb8b83b42f74e57943d378489b44df49eddf8..c636e35ed25b8f472e0d61777ddcfc5bb7830bcf 100644
--- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
+++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -92,8 +92,8 @@ void EnsureRunningOn(base::SingleThreadTaskRunner* runner) {
void VerifySameTaskRunner(
base::SingleThreadTaskRunner* runner1,
base::SingleThreadTaskRunner* runner2) {
- ASSERT_TRUE(runner1 != NULL);
- ASSERT_TRUE(runner2 != NULL);
+ ASSERT_TRUE(runner1 != nullptr);
+ ASSERT_TRUE(runner2 != nullptr);
runner1->PostTask(FROM_HERE,
base::Bind(&EnsureRunningOn, make_scoped_refptr(runner2)));
}
@@ -255,7 +255,7 @@ void CannedSyncableFileSystem::SetUp(QuotaMode quota_mode) {
file_task_runner_.get(),
storage::ExternalMountPoints::CreateRefCounted().get(),
storage_policy.get(),
- quota_manager_.get() ? quota_manager_->proxy() : NULL,
+ quota_manager_.get() ? quota_manager_->proxy() : nullptr,
additional_backends.Pass(),
std::vector<storage::URLRequestAutoMountHandler>(),
data_dir_.path(),
@@ -265,8 +265,8 @@ void CannedSyncableFileSystem::SetUp(QuotaMode quota_mode) {
}
void CannedSyncableFileSystem::TearDown() {
- quota_manager_ = NULL;
- file_system_context_ = NULL;
+ quota_manager_ = nullptr;
+ file_system_context_ = nullptr;
// Make sure we give some more time to finish tasks on other threads.
EnsureLastTaskRuns(io_task_runner_.get());
« no previous file with comments | « chrome/browser/sync_file_system/file_change.cc ('k') | chrome/browser/sync_file_system/local/local_file_change_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698