| Index: chrome/browser/profiles/profile_manager.cc
|
| diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
|
| index fc818cd57480c6cbd4abac60cfae5f04d5ae1898..e5b6a946007c8df11b841721a990702f2e30d5d3 100644
|
| --- a/chrome/browser/profiles/profile_manager.cc
|
| +++ b/chrome/browser/profiles/profile_manager.cc
|
| @@ -318,7 +318,7 @@ Profile* ProfileManager::GetPrimaryUserProfile() {
|
| profile_manager->user_data_dir());
|
| chromeos::UserManager* manager = chromeos::UserManager::Get();
|
| // Note: The ProfileHelper will take care of guest profiles.
|
| - return chromeos::ProfileHelper::Get()->GetProfileByUser(
|
| + return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(
|
| manager->GetPrimaryUser());
|
| #else
|
| return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
|
| @@ -343,7 +343,7 @@ Profile* ProfileManager::GetActiveUserProfile() {
|
| // created we load the profile using the profile directly.
|
| // TODO: This should be cleaned up with the new profile manager.
|
| if (user && user->is_profile_created())
|
| - return chromeos::ProfileHelper::Get()->GetProfileByUser(user);
|
| + return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
|
|
|
| #endif
|
| Profile* profile =
|
|
|