Never open guest pre-NewAvatarMenu

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 68ca846aac6ff574c20619110c15c973aa39e224..9bf8ab96127d038158b4c90135c43dc5f4d83c18 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -342,6 +342,13 @@ Profile* CreatePrimaryProfile(const content::MainFunctionParams& parameters,
 #else
   base::FilePath profile_path =
       GetStartupProfilePath(user_data_dir, parsed_command_line);
+
+  // Without NewAvatarMenu, replace guest with the default profile.
+  if (!switches::IsNewAvatarMenu() &&
+      profile_path == ProfileManager::GetGuestProfilePath()) {
+    profile_path = g_browser_process->profile_manager()->GetProfileInfoCache().
+        GetPathOfProfileAtIndex(0);

[jochen (gone - plz use gerrit), 2014/09/08 12:14:21]

is zero the default profile? Should maybe be a constant on ProfileInfoCache
then? Or should this rather be the last used profile?

[Mike Lerman, 2014/09/08 14:02:33]

The problem with the last used profile is the last used profile was guest...
which I can't use because the flag that introduced guest is now disabled. So I'm
essentially opening any profile I can find.

There's no concept of a "Default" profile, or anything particularly special
about the profile at index 0, except that I'm guaranteed to have a profile at
index 0.

+  }
   profile = g_browser_process->profile_manager()->GetProfile(
       profile_path);