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

chrome/browser/profiles/profile_manager.h

 // 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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 
 #include <list>
@@ skipping 45 matching lines @@
   // Get the profile for the user which created the current session.
   // Note that in case of a guest account this will return a 'suitable' profile.
   static Profile* GetPrimaryUserProfile();
 
   // Get the profile for the currently active user.
   // Note that in case of a guest account this will return a 'suitable' profile.
   static Profile* GetActiveUserProfile();
 
   // 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.
   Profile* GetProfile(const base::FilePath& profile_dir);
 
   // Returns total number of profiles available on this machine.
   size_t GetNumberOfProfiles();
 
   // Explicit asynchronous creation of a profile located at |profile_path|.
   // If the profile has already been created then callback is called
@@ skipping 169 matching lines @@
     // Whether or not this profile should have a shortcut.
     bool create_shortcut;
     // List of callbacks to run when profile initialization is done. Note, when
     // profile is fully loaded this vector will be empty.
     std::vector<CreateCallback> callbacks;
 
    private:
     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.
   // Returns true if the profile was added, false otherwise.
   bool AddProfile(Profile* profile);
 
   // Schedules the profile at the given path to be deleted on shutdown.
   void FinishDeletingProfile(const base::FilePath& profile_dir);
 
   // Registers profile with given info. Returns pointer to created ProfileInfo
@@ skipping 94 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir);
 
  protected:
   virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {}
   virtual void DoFinalInitLogging(Profile*) OVERRIDE {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_