Add ProfileManager::AllowGetDefaultProfile()

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 29 matching lines @@
   virtual ~ProfileManager();
 
 #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();
 
+  // 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
   // 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: Temporary measure to ensure that GetDefaultProfile() is not
+  // called before CreateProfile() is called in chrome_browser_main.cc.
+  static void AllowGetDefaultProfile();

[Paweł Hajdan Jr., 2013/05/23 21:59:32]

nit: Please comment what this function does.

[stevenjb, 2013/05/23 23:15:07]

Done.

+
   // DEPRECATED: DO NOT USE unless in ChromeOS.
   // Same as instance method but provides the default user_data_dir as well.
   static Profile* GetDefaultProfile();
 
   // DEPRECATED: DO NOT USE unless in ChromeOS.
   // Same as GetDefaultProfile() but returns OffTheRecord profile
   // if guest login.
   static Profile* GetDefaultProfileOrOffTheRecord();
 
   // Returns a profile for a specific profile directory within the user data
@@ skipping 302 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_