Clean up ProfileManager interface.

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 26 matching lines @@
   ~ProfileManager() override;
 
 #if defined(ENABLE_SESSION_SERVICE)
   // Invokes SessionServiceFactory::ShutdownForProfile() for all profiles.
   static void ShutdownSessionServices();
 #endif
 
   // Physically remove deleted profile directories from disk.
   static void NukeDeletedProfilesFromDisk();
 
-  // Same as instance method but provides the default user_data_dir as well.
-  // If the Profile is going to be used to open a new window then consider using
-  // GetLastUsedProfileAllowedByPolicy() instead.
-  static Profile* GetLastUsedProfile();
-
-  // Same as GetLastUsedProfile() but returns the incognito Profile if
-  // incognito mode is forced. This should be used if the last used Profile
-  // will be used to open new browser windows.
-  static Profile* GetLastUsedProfileAllowedByPolicy();
-
-  // Same as instance method but provides the default user_data_dir as well.
-  static std::vector<Profile*> GetLastOpenedProfiles();
-
   // 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.
   // This function is temporary and will soon be moved to ash. As such avoid
   // using it at all cost.
   // TODO(skuhne): Move into ash's new user management function.
   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.
   // This function is temporary and will soon be moved to ash. As such avoid
@@ skipping 27 matching lines @@
   // profile.
   bool IsValidProfile(Profile* profile);
 
   // Returns the directory where the first created profile is stored,
   // relative to the user data directory currently in use.
   base::FilePath GetInitialProfileDir();
 
   // Get the Profile last used (the Profile to which owns the most recently
   // focused window) with this Chrome build. If no signed profile has been
   // stored in Local State, hand back the Default profile.
-  Profile* GetLastUsedProfile(const base::FilePath& user_data_dir);
+  // If the Profile is going to be used to open a new window then consider using
+  // GetLastUsedProfileAllowedByPolicy() instead.
+  Profile* GetLastUsedProfile();
+
+  // Same as GetLastUsedProfile() but returns the incognito Profile if
+  // incognito mode is forced. This should be used if the last used Profile
+  // will be used to open new browser windows.
+  Profile* GetLastUsedProfileAllowedByPolicy();
 
   // Get the path of the last used profile, or if that's undefined, the default
   // profile.
-  base::FilePath GetLastUsedProfileDir(const base::FilePath& user_data_dir);
+  base::FilePath GetLastUsedProfileDir();
 
   // Get the name of the last used profile, or if that's undefined, the default
   // profile.
   std::string GetLastUsedProfileName();
 
   // Get the Profiles which are currently open, i.e., have open browsers, or
   // were open the last time Chrome was running. The Profiles appear in the
   // order they were opened. The last used profile will be on the list, but its
   // index on the list will depend on when it was opened (it is not necessarily
   // the last one).
-  std::vector<Profile*> GetLastOpenedProfiles(
-      const base::FilePath& user_data_dir);
+  std::vector<Profile*> GetLastOpenedProfiles();
 
   // Returns created and fully initialized profiles. Note, profiles order is NOT
   // guaranteed to be related with the creation order.
   std::vector<Profile*> GetLoadedProfiles() const;
 
   // If a profile with the given path is currently managed by this object and
   // fully initialized, return a pointer to the corresponding Profile object;
   // otherwise return null.
   Profile* GetProfileByPath(const base::FilePath& path) const;
 
@@ skipping 111 matching lines @@
 
    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);
+  Profile* GetActiveUserOrOffTheRecordProfileFromPath();
 
   // 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);
 
   // Synchronously creates and returns a profile. This handles both the full
   // creation and adds it to the set managed by this ProfileManager.
   Profile* CreateAndInitializeProfile(const base::FilePath& profile_dir);
@@ skipping 108 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir);
 
  protected:
   void DoFinalInitForServices(Profile*, bool) override {}
   void DoFinalInitLogging(Profile*) override {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_