Fail gracefully when starting Chrome with an invalid kProfileDirectory.

chrome/browser/chrome_browser_main.cc

 // 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.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 335 matching lines @@
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   // On ChromeOS and Android the ProfileManager will use the same path as the
   // one we got passed. GetActiveUserProfile will therefore use the correct path
   // automatically.
   DCHECK_EQ(user_data_dir.value(),
             g_browser_process->profile_manager()->user_data_dir().value());
   profile = ProfileManager::GetActiveUserProfile();
 #else
   base::FilePath profile_path =
       GetStartupProfilePath(user_data_dir, parsed_command_line);
+  ProfileInfoCache& cache =

[Mike Lerman, 2015/03/31 20:48:30]

nit: Can this be a const ProfileInfoCache&?

[noms (inactive), 2015/03/31 21:01:33]

Done.

+      g_browser_process->profile_manager()->GetProfileInfoCache();
 
   // Without NewAvatarMenu, replace guest with any existing profile.
   if (!switches::IsNewAvatarMenu() &&
       profile_path == ProfileManager::GetGuestProfilePath()) {
-    profile_path = g_browser_process->profile_manager()->GetProfileInfoCache().
-        GetPathOfProfileAtIndex(0);
+    profile_path = cache.GetPathOfProfileAtIndex(0);
   }
+
+  // If we are trying to load a profile that has been deleted (for example from
+  // an old shortcut, or using an incorrect kProfileDirectory argument), set
+  // the active profile to Guest to force showing the User Manager.
+  size_t profile_index = cache.GetIndexOfProfileWithPath(profile_path);
+  if (profile_index == std::string::npos)

[Mike Lerman, 2015/03/31 20:48:30]

We need to make sure that those folks who have disabled NewAvatarMenu can't end
up trying to load guest when they're not supposed to; either add a
!switches::IsNewAvatarMenu() check, or just move this code up above line 360.

[noms (inactive), 2015/03/31 21:01:33]

Ughhhhh that's a weird result now, though (but you are correct, they shouldn't
have a User Manager). I can't wait till this gets deleted.

+    profile_path = ProfileManager::GetGuestProfilePath();
+
   profile = g_browser_process->profile_manager()->GetProfile(
       profile_path);
 
   // If we're using the --new-profile-management flag and this profile is
   // signed out, then we should show the user manager instead. By switching
   // the active profile to the guest profile we ensure that no
   // browser windows will be opened for the guest profile.
   if (switches::IsNewProfileManagement() &&
       profile &&
       !profile->IsGuestSession()) {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    size_t profile_index = cache.GetIndexOfProfileWithPath(profile_path);
-
     if (profile_index != std::string::npos &&

[Mike Lerman, 2015/03/31 20:48:30]

We can remove the profile_index != std::string::npos condition here. We've
ensured we can never get to this.

[noms (inactive), 2015/03/31 21:01:33]

Done.

         cache.ProfileIsSigninRequiredAtIndex(profile_index)) {
       profile = g_browser_process->profile_manager()->GetProfile(
           ProfileManager::GetGuestProfilePath());
     }
   }
 #endif  // defined(OS_CHROMEOS) || defined(OS_ANDROID)
   if (profile) {
     UMA_HISTOGRAM_LONG_TIMES(
         "Startup.CreateFirstProfile", base::Time::Now() - start);
     return profile;
@@ skipping 1342 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }