Removing GetDefaultProfileOrOffTheRecord and GetDefaultProfile(<path>) from ProfileManager's (publi…

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 199 matching lines @@
        ++it) {
     NukeProfileFromDisk(*it);
   }
   ProfilesToDelete().clear();
 }
 
 // static
 // TODO(skuhne): Remove this method once all clients are migrated.
 Profile* ProfileManager::GetDefaultProfile() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
-  return profile_manager->GetDefaultProfile(profile_manager->user_data_dir_);
+  return profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
+             profile_manager->user_data_dir_);
 }
 
 // static
-// TODO(skuhne): Remove this method once all clients are migrated.
-Profile* ProfileManager::GetDefaultProfileOrOffTheRecord() {
-  return GetDefaultProfile();
-}
-
-// static
 Profile* ProfileManager::GetLastUsedProfile() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   return profile_manager->GetLastUsedProfile(profile_manager->user_data_dir_);
 }
 
 // static
 Profile* ProfileManager::GetLastUsedProfileAllowedByPolicy() {
   Profile* profile = GetLastUsedProfile();
   if (IncognitoModePrefs::GetAvailability(profile->GetPrefs()) ==
       IncognitoModePrefs::FORCED) {
@@ skipping 90 matching lines @@
   relative_profile_dir =
       relative_profile_dir.AppendASCII(chrome::kInitialProfile);
   return relative_profile_dir;
 }
 
 Profile* ProfileManager::GetLastUsedProfile(
     const base::FilePath& user_data_dir) {
 #if defined(OS_CHROMEOS)
   // Use default login profile if user has not logged in yet.
   if (!logged_in_) {
-    return GetDefaultProfile(user_data_dir);
+    return GetActiveUserOrOffTheRecordProfileFromPath(user_data_dir);
   } else {
     // CrOS multi-profiles implementation is different so GetLastUsedProfile
     // has custom implementation too.
     base::FilePath profile_dir;
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     if (command_line.HasSwitch(switches::kMultiProfiles)) {
       // In case of multi-profiles we ignore "last used profile" preference
       // since it may refer to profile that has been in use in previous session.
       // That profile dir may not be mounted in this session so instead return
       // active profile from current session.
@@ skipping 70 matching lines @@
   if (!profile_manager->IsLoggedIn() || !chromeos::UserManager::IsInitialized())
     return GetDefaultProfile();
   chromeos::UserManager* manager = chromeos::UserManager::Get();
   // Note: The user manager will take care of guest profiles.
   return manager->GetProfileByUser(manager->GetActiveUser());
 #else
   return GetDefaultProfile();
 #endif
 }
 
-Profile* ProfileManager::GetDefaultProfile(
-    const base::FilePath& user_data_dir) {
-#if defined(OS_CHROMEOS)
-  base::FilePath default_profile_dir(user_data_dir);
-  if (logged_in_) {
-    default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
-  } else {
-    default_profile_dir = profiles::GetDefaultProfileDir(user_data_dir);
-  }
-#else
-  base::FilePath default_profile_dir(user_data_dir);
-  default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
-#endif
-#if defined(OS_CHROMEOS)
-  if (!logged_in_) {
-    Profile* profile = GetProfile(default_profile_dir);
-    // For cros, return the OTR profile so we never accidentally keep
-    // user data in an unencrypted profile. But doing this makes
-    // many of the browser and ui tests fail. We do return the OTR profile
-    // if the login-profile switch is passed so that we can test this.
-    if (ShouldGoOffTheRecord(profile))
-      return profile->GetOffTheRecordProfile();
-    DCHECK(!chromeos::UserManager::Get()->IsLoggedInAsGuest());
-    return profile;
-  }
-
-  ProfileInfo* profile_info = GetProfileInfoByPath(default_profile_dir);
-  // Fallback to default off-the-record profile, if user profile has not fully
-  // loaded yet.
-  if (profile_info && !profile_info->created)
-    default_profile_dir = profiles::GetDefaultProfileDir(user_data_dir);
-
-  Profile* profile = GetProfile(default_profile_dir);
-  // Some unit tests didn't initialize the UserManager.
-  if (chromeos::UserManager::IsInitialized() &&
-      chromeos::UserManager::Get()->IsLoggedInAsGuest())
-    return profile->GetOffTheRecordProfile();
-  return profile;
-#else
-  return GetProfile(default_profile_dir);
-#endif
-}
-
 bool ProfileManager::IsValidProfile(Profile* profile) {
   for (ProfilesInfoMap::iterator iter = profiles_info_.begin();
        iter != profiles_info_.end(); ++iter) {
     if (iter->second->created) {
       Profile* candidate = iter->second->profile.get();
       if (candidate == profile ||
           (candidate->HasOffTheRecordProfile() &&
            candidate->GetOffTheRecordProfile() == profile)) {
         return true;
       }
@@ skipping 81 matching lines @@
       // Profile has already been created. Run callback immediately.
       callback.Run(profile, Profile::CREATE_STATUS_INITIALIZED);
     } else {
       // Profile is either already in the process of being created, or new.
       // Add callback to the list.
       info->callbacks.push_back(callback);
     }
   }
 }
 
+Profile* ProfileManager::GetActiveUserOrOffTheRecordProfileFromPath(
+    const base::FilePath& user_data_dir) {
+#if defined(OS_CHROMEOS)
+  base::FilePath default_profile_dir(user_data_dir);
+  if (!logged_in_) {
+    default_profile_dir = profiles::GetDefaultProfileDir(user_data_dir);
+    Profile* profile = GetProfile(default_profile_dir);
+    // For cros, return the OTR profile so we never accidentally keep
+    // user data in an unencrypted profile. But doing this makes
+    // many of the browser and ui tests fail. We do return the OTR profile
+    // if the login-profile switch is passed so that we can test this.
+    if (ShouldGoOffTheRecord(profile))
+      return profile->GetOffTheRecordProfile();
+    DCHECK(!chromeos::UserManager::Get()->IsLoggedInAsGuest());
+    return profile;
+  }
+
+  default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
+  ProfileInfo* profile_info = GetProfileInfoByPath(default_profile_dir);
+  // Fallback to default off-the-record profile, if user profile has not fully
+  // loaded yet.
+  if (profile_info && !profile_info->created)
+    default_profile_dir = profiles::GetDefaultProfileDir(user_data_dir);
+
+  Profile* profile = GetProfile(default_profile_dir);
+  // Some unit tests didn't initialize the UserManager.
+  if (chromeos::UserManager::IsInitialized() &&
+      chromeos::UserManager::Get()->IsLoggedInAsGuest())
+    return profile->GetOffTheRecordProfile();
+  return profile;
+#else
+  base::FilePath default_profile_dir(user_data_dir);
+  default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
+  return GetProfile(default_profile_dir);
+#endif
+}
+
 bool ProfileManager::AddProfile(Profile* profile) {
   DCHECK(profile);
 
   // Make sure that we're not loading a profile with the same ID as a profile
   // that's already loaded.
   if (GetProfileByPath(profile->GetPath())) {
     NOTREACHED() << "Attempted to add profile with the same path (" <<
                     profile->GetPath().value() <<
                     ") as an already-loaded profile.";
     return false;
@@ skipping 662 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }