| Index: chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
|
| index 4c123dd57f44b41f632eeef91a00c3161e337890..dd2b3f6b49dddf10e72642c4c5cf243f907a4d78 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_invalidator_unittest.cc
|
| @@ -172,9 +172,9 @@ void DeviceCloudPolicyInvalidatorTest::TearDown() {
|
| base::RunLoop().RunUntilIdle();
|
|
|
| invalidation::ProfileInvalidationProviderFactory::GetInstance()->
|
| - RegisterTestingFactory(NULL);
|
| + RegisterTestingFactory(nullptr);
|
| chromeos::DeviceSettingsService::Get()->UnsetSessionManager();
|
| - TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(NULL);
|
| + TestingBrowserProcess::GetGlobal()->SetBrowserPolicyConnector(nullptr);
|
| chromeos::DeviceOAuth2TokenServiceFactory::Shutdown();
|
| chromeos::DBusThreadManager::Shutdown();
|
| chromeos::SystemSaltGetter::Shutdown();
|
| @@ -209,7 +209,7 @@ DeviceCloudPolicyInvalidatorTest::GetProfileInvalidationService(
|
| invalidation::ProfileInvalidationProviderFactory::GetInstance()->
|
| GetServiceForBrowserContext(profile, false));
|
| if (!invalidation_provider)
|
| - return NULL;
|
| + return nullptr;
|
| return static_cast<invalidation::FakeInvalidationService*>(
|
| invalidation_provider->GetInvalidationService());
|
| }
|
|
|