Skip profiles in GetLastOpenedProfiles that fail to initialize

chrome/browser/profiles/profile_manager.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/profiles/profile_manager.h"
 
 #include <stdint.h>
 
 #include <set>
 #include <string>
@@ skipping 604 matching lines @@
     std::unique_ptr<base::ListValue> profile_list(
         local_state->GetList(prefs::kProfilesLastActive)->DeepCopy());
     base::ListValue::const_iterator it;
     std::string profile;
     for (it = profile_list->begin(); it != profile_list->end(); ++it) {
       if (!(*it)->GetAsString(&profile) || profile.empty() ||
           profile == base::FilePath(chrome::kSystemProfileDir).AsUTF8Unsafe()) {
         LOG(WARNING) << "Invalid entry in " << prefs::kProfilesLastActive;
         continue;
       }
-      to_return.push_back(GetProfile(user_data_dir.AppendASCII(profile)));
+      Profile* profile = GetProfile(user_data_dir.AppendASCII(profile));
+      if (profile)
+        to_return.push_back(profile);
     }
   }
   return to_return;
 }
 
 std::vector<Profile*> ProfileManager::GetLoadedProfiles() const {
   std::vector<Profile*> profiles;
   for (ProfilesInfoMap::const_iterator iter = profiles_info_.begin();
        iter != profiles_info_.end(); ++iter) {
     if (iter->second->created)
@@ skipping 696 matching lines @@
       "Startup", "ProfileManager::CreateAndInitializeProfile");
   SCOPED_UMA_HISTOGRAM_LONG_TIMER("Profile.CreateAndInitializeProfile");
 
   // CHECK that we are not trying to load the same profile twice, to prevent
   // profile corruption. Note that this check also covers the case when we have
   // already started loading the profile but it is not fully initialized yet,
   // which would make Bad Things happen if we returned it.
   CHECK(!GetProfileByPathInternal(profile_dir));
   Profile* profile = CreateProfileHelper(profile_dir);
   DCHECK(profile);
   if (profile) {

[Peter Kasting, 2016/05/31 11:41:09]

This code violates the prohibition on handling DCHECK failure.

Furthermore, based on your comments, it sounds like it's possible for some of
the DCHECKs in this function to fail (since otherwise GetProfile() can't return
null, AFAICT).

Please update this code, determining which checks can fail and which cannot. 
Checks which cannot fail should not have conditional code to handle failure. 
Checks which can fail should not be DCHECKs to begin with.

Please also update the comments for this function and/or GetProfile() to make it
clear when they can fail, if ever.

[WC Leung, 2016/05/31 17:41:07]

Done.

     bool result = AddProfile(profile);
     DCHECK(result);
   }
   return profile;
 }
 
 #if !defined(OS_ANDROID)
 void ProfileManager::FinishDeletingProfile(
     const base::FilePath& profile_dir,
     const base::FilePath& new_active_profile_dir) {
@@ skipping 287 matching lines @@
 
   FinishDeletingProfile(profile_to_delete_path, new_active_profile_path);
   if (!original_callback.is_null())
     original_callback.Run(loaded_profile, status);
 }
 #endif  // !defined(OS_ANDROID)
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }