Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc |
index f23b9e997dd7bfdcfdb174f5c8e5e1faf9c72e48..5318238a64b9383888599f7f35e876dcbebcc79c 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc |
@@ -71,7 +71,7 @@ class ConflictResolverTest : public testing::Test { |
context_.reset(new SyncEngineContext( |
fake_drive_service.PassAs<drive::DriveServiceInterface>(), |
drive_uploader.Pass(), |
- NULL, |
+ nullptr, |
base::ThreadTaskRunnerHandle::Get(), |
base::ThreadTaskRunnerHandle::Get())); |
context_->SetRemoteChangeProcessor(remote_change_processor_.get()); |