Merge "cros: Fix loading user profile w/o UserSessionManager"

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 385f9c360fe2b718b6a9556d811bb8f0a4532b2e..5753fecbe39f9855ad60e0863b01579cb5f13bb6 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -81,6 +81,12 @@ class ProfileManager : public base::NonThreadSafe,
   // TODO(skuhne): Move into ash's new user management function.
   static Profile* GetActiveUserProfile();
 
+  // Load and return the initial profile for browser. On ChromeOS, this returns
+  // either the sign-in profile or the active user profile depending on whether
+  // browser is started normally or is restarted after crash. On other
+  // platforms, this returns the default profile.
+  static Profile* CreateInitialProfile();
+
   // 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.