| Index: chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| index 2f191440497511b4dd4e59cb022ba248c0b3d799..80c6d12190ef61fd27a7e4e26bfc090a4fd4c095 100644
|
| --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
|
| @@ -53,9 +53,9 @@ ProfileInvalidationProvider* ProfileInvalidationProviderFactory::GetForProfile(
|
| // when this method is called during the creation of the sign-in profile
|
| // itself. Using ProfileHelper::GetSigninProfileDir() is safe because it does
|
| // not try to access the sign-in profile.
|
| - if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir()||
|
| + if (profile->GetPath() == chromeos::ProfileHelper::GetSigninProfileDir() ||
|
| (chromeos::UserManager::IsInitialized() &&
|
| - chromeos::UserManager::Get()->IsLoggedInAsGuest())) {
|
| + chromeos::GetUserManager()->IsLoggedInAsGuest())) {
|
| // The Chrome OS login and Chrome OS guest profiles do not have GAIA
|
| // credentials and do not support invalidation.
|
| return NULL;
|
| @@ -111,7 +111,7 @@ KeyedService* ProfileInvalidationProviderFactory::BuildServiceInstanceFor(
|
| policy::BrowserPolicyConnectorChromeOS* connector =
|
| g_browser_process->platform_part()->browser_policy_connector_chromeos();
|
| if (chromeos::UserManager::IsInitialized() &&
|
| - chromeos::UserManager::Get()->IsLoggedInAsKioskApp() &&
|
| + chromeos::GetUserManager()->IsLoggedInAsKioskApp() &&
|
| connector->IsEnterpriseManaged()) {
|
| identity_provider.reset(new chromeos::DeviceIdentityProvider(
|
| chromeos::DeviceOAuth2TokenServiceFactory::Get()));
|
|
|