Removal of GetDefaultProfile from UserManagerImpl

BUG=322682
TEST=covered by existing unit tests

Review URL: https://codereview.chromium.org/127963004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243860 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/user_manager_impl.cc

@@ -609,10 +609,10 @@ Profile* UserManagerImpl::GetProfileByUser(const User* user) const {
   if (IsMultipleProfilesAllowed() && user->is_profile_created())
     profile = ProfileHelper::GetProfileByUserIdHash(user->username_hash());
   else
-    profile = g_browser_process->profile_manager()->GetDefaultProfile();
+    profile = ProfileManager::GetActiveUserProfile();
 
-  // GetDefaultProfile() or GetProfileByUserIdHash() returns a new instance of
-  // ProfileImpl(), but actually its OffTheRecordProfile() should be used.
+  // GetActiveUserProfile() or GetProfileByUserIdHash() returns a new instance
+  // of ProfileImpl(), but actually its OffTheRecordProfile() should be used.
   if (profile && IsLoggedInAsGuest())
     profile = profile->GetOffTheRecordProfile();
   return profile;

chrome/browser/profiles/profile_manager.cc

@@ -418,7 +418,9 @@ Profile* ProfileManager::GetPrimaryUserProfile() {
 Profile* ProfileManager::GetActiveUserProfile() {
 #if defined(OS_CHROMEOS)
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  if (!profile_manager->IsLoggedIn() || !chromeos::UserManager::IsInitialized())
+  if (!chromeos::UserManager::IsMultipleProfilesAllowed() ||
+      !profile_manager->IsLoggedIn() ||
+      !chromeos::UserManager::IsInitialized())
     return GetDefaultProfile();
   chromeos::UserManager* manager = chromeos::UserManager::Get();
   // Note: The user manager will take care of guest profiles.