| Index: chrome/browser/sync/sync_global_error_factory.cc
|
| diff --git a/chrome/browser/sync/sync_global_error_factory.cc b/chrome/browser/sync/sync_global_error_factory.cc
|
| index a2a88b4a54bf60c39cd168504b1eba119869f466..64fa2c23e1cba26fad0f0f26e9b68023eb653c64 100644
|
| --- a/chrome/browser/sync/sync_global_error_factory.cc
|
| +++ b/chrome/browser/sync/sync_global_error_factory.cc
|
| @@ -44,7 +44,7 @@ KeyedService* SyncGlobalErrorFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* context) const {
|
| #if defined(USE_ASH)
|
| if (ash::Shell::HasInstance())
|
| - return NULL;
|
| + return nullptr;
|
| #endif
|
|
|
| Profile* profile = static_cast<Profile*>(context);
|
| @@ -52,12 +52,12 @@ KeyedService* SyncGlobalErrorFactory::BuildServiceInstanceFor(
|
| ProfileSyncServiceFactory::GetForProfile(profile);
|
|
|
| if (!profile_sync_service)
|
| - return NULL;
|
| + return nullptr;
|
|
|
| syncer::SyncErrorController* sync_error_controller =
|
| profile_sync_service->sync_error_controller();
|
| if (!sync_error_controller)
|
| - return NULL;
|
| + return nullptr;
|
|
|
| return new SyncGlobalError(GlobalErrorServiceFactory::GetForProfile(profile),
|
| LoginUIServiceFactory::GetForProfile(profile),
|
|
|