| Index: chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.cc b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| index 3ef1a2c68be02c278ebd04652916a37ac3410304..ba7c212bc120e924027490c3f9fc6ab78583ae55 100644
|
| --- a/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
|
| @@ -107,7 +107,7 @@ void LocalFileSyncService::OriginChangeMap::SetOriginEnabled(
|
|
|
| scoped_ptr<LocalFileSyncService> LocalFileSyncService::Create(
|
| Profile* profile) {
|
| - return make_scoped_ptr(new LocalFileSyncService(profile, NULL));
|
| + return make_scoped_ptr(new LocalFileSyncService(profile, nullptr));
|
| }
|
|
|
| scoped_ptr<LocalFileSyncService> LocalFileSyncService::CreateForTesting(
|
| @@ -126,7 +126,7 @@ LocalFileSyncService::~LocalFileSyncService() {
|
| void LocalFileSyncService::Shutdown() {
|
| sync_context_->RemoveOriginChangeObserver(this);
|
| sync_context_->ShutdownOnUIThread();
|
| - profile_ = NULL;
|
| + profile_ = nullptr;
|
| }
|
|
|
| void LocalFileSyncService::MaybeInitializeFileSystemContext(
|
| @@ -350,7 +350,7 @@ LocalFileSyncService::LocalFileSyncService(Profile* profile,
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get(),
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)
|
| .get())),
|
| - local_change_processor_(NULL) {
|
| + local_change_processor_(nullptr) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| sync_context_->AddOriginChangeObserver(this);
|
| }
|
|
|