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

chrome/browser/profiles/profile_manager.h

Index: chrome/browser/profiles/profile_manager.h
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index 051f1c1d562d53537b264802dd844aa83da44d63..be937f49852ad3188de2e90dcc2238a919bc7a6d 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -64,21 +64,13 @@ class ProfileManager : public base::NonThreadSafe,
   // The following DEPRECATED functions should be removed: crbug.com/83792.
 
   // DEPRECATED: DO NOT USE unless in ChromeOS.

[Dmitry Polukhin, 2014/01/08 23:44:14]

I think comment should say that this function should not be used even on Chrome
OS and GetPrimaryUserProfile/GetActiveUserProfile should be used instead.

[Mr4D (OOO till 08-26), 2014/01/09 00:01:21]

Makes sense - Done!

-  // Returns the default profile.  This adds the profile to the
-  // ProfileManager if it doesn't already exist.  This method returns NULL if
+  // Returns the default profile. This adds the profile to the
+  // ProfileManager if it doesn't already exist. This method returns NULL if
   // the profile doesn't exist and we can't create it.
   // The profile used can be overridden by using --login-profile on cros.
-  Profile* GetDefaultProfile(const base::FilePath& user_data_dir);
-
-  // DEPRECATED: DO NOT USE unless in ChromeOS.
-  // Same as instance method but provides the default user_data_dir as well.
   // Note that in case of a guest account this will return a 'suitable' profile.
   static Profile* GetDefaultProfile();
 
-  // DEPRECATED: DO NOT USE unless in ChromeOS.
-  // Same as GetDefaultProfile(). Do not use.
-  static Profile* GetDefaultProfileOrOffTheRecord();
-
   // Returns a profile for a specific profile directory within the user data
   // dir. This will return an existing profile it had already been created,
   // otherwise it will create and manage it.
@@ -268,6 +260,14 @@ class ProfileManager : public base::NonThreadSafe,
     DISALLOW_COPY_AND_ASSIGN(ProfileInfo);
   };
 
+  // Returns the profile of the active user and / or the off the record profile
+  // if needed. This adds the profile to the ProfileManager if it doesn't
+  // already exist. The method will return NULL if the profile doesn't exist
+  // and we can't create it.
+  // The profile used can be overridden by using --login-profile on cros.
+  Profile* GetActiveUserOrOffTheRecordProfileFromPath(
+               const base::FilePath& user_data_dir);
+
   // Adds a pre-existing Profile object to the set managed by this
   // ProfileManager. This ProfileManager takes ownership of the Profile.
   // The Profile should not already be managed by this ProfileManager.