Index: chrome/browser/profiles/profile_manager.cc |
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc |
index 845f33c818d4799b1e575f41689c06cb69a45972..470ecd49772f8d29a9e032655499e5d854839b8d 100644 |
--- a/chrome/browser/profiles/profile_manager.cc |
+++ b/chrome/browser/profiles/profile_manager.cc |
@@ -314,7 +314,7 @@ Profile* ProfileManager::GetPrimaryUserProfile() { |
if (!profile_manager->IsLoggedIn() || !chromeos::UserManager::IsInitialized()) |
return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath( |
profile_manager->user_data_dir()); |
- chromeos::UserManager* manager = chromeos::UserManager::Get(); |
+ chromeos::UserManager* manager = chromeos::GetUserManager(); |
// Note: The ProfileHelper will take care of guest profiles. |
return chromeos::ProfileHelper::Get()->GetProfileByUser( |
manager->GetPrimaryUser()); |
@@ -334,7 +334,7 @@ Profile* ProfileManager::GetActiveUserProfile() { |
profile_manager->user_data_dir()); |
} |
- chromeos::UserManager* manager = chromeos::UserManager::Get(); |
+ chromeos::UserManager* manager = chromeos::GetUserManager(); |
const chromeos::User* user = manager->GetActiveUser(); |
// To avoid an endless loop (crbug.com/334098) we have to additionally check |
// if the profile of the user was already created. If the profile was not yet |
@@ -1036,7 +1036,7 @@ Profile* ProfileManager::GetActiveUserOrOffTheRecordProfileFromPath( |
// if the login-profile switch is passed so that we can test this. |
if (ShouldGoOffTheRecord(profile)) |
return profile->GetOffTheRecordProfile(); |
- DCHECK(!chromeos::UserManager::Get()->IsLoggedInAsGuest()); |
+ DCHECK(!chromeos::GetUserManager()->IsLoggedInAsGuest()); |
return profile; |
} |
@@ -1050,7 +1050,7 @@ Profile* ProfileManager::GetActiveUserOrOffTheRecordProfileFromPath( |
Profile* profile = GetProfile(default_profile_dir); |
// Some unit tests didn't initialize the UserManager. |
if (chromeos::UserManager::IsInitialized() && |
- chromeos::UserManager::Get()->IsLoggedInAsGuest()) |
+ chromeos::GetUserManager()->IsLoggedInAsGuest()) |
return profile->GetOffTheRecordProfile(); |
return profile; |
#else |