| Index: chrome/browser/profiles/profile_manager.h
|
| diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
|
| index 05babfa8d51a1611f99e5a01161dcd78a516b18f..5f21160d51cd605c62316ba626a74ed81375b7bc 100644
|
| --- a/chrome/browser/profiles/profile_manager.h
|
| +++ b/chrome/browser/profiles/profile_manager.h
|
| @@ -47,6 +47,8 @@ class ProfileManager : public base::NonThreadSafe,
|
| // Physically remove deleted profile directories from disk.
|
| static void NukeDeletedProfilesFromDisk();
|
|
|
| + // The following DEPRECATED functions should be removed: crbug.com/83792.
|
| +
|
| // DEPRECATED: DO NOT USE unless in ChromeOS.
|
| // Returns the default profile. This adds the profile to the
|
| // ProfileManager if it doesn't already exist. This method returns NULL if
|
| @@ -54,6 +56,13 @@ class ProfileManager : public base::NonThreadSafe,
|
| // The profile used can be overridden by using --login-profile on cros.
|
| Profile* GetDefaultProfile(const base::FilePath& user_data_dir);
|
|
|
| + // DEPRECATED: Temporary measure to ensure that GetDefaultProfile() is not
|
| + // called before CreateProfile() is called in chrome_browser_main.cc.
|
| + // Note: This needs to be called with 'false' first (early in
|
| + // ChromeBrowserMainParts), otherwise it will assume 'true' so as not to
|
| + // affect any tests.
|
| + static void SetAllowGetDefaultProfile(bool allow);
|
| +
|
| // DEPRECATED: DO NOT USE unless in ChromeOS.
|
| // Same as instance method but provides the default user_data_dir as well.
|
| static Profile* GetDefaultProfile();
|
|
|