Merge 139419 - fix crash when double-deleting a profile

chrome/browser/profiles/profile_info_cache.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_info_cache.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 207 matching lines @@
 
 void ProfileInfoCache::AddObserver(ProfileInfoCacheObserver* obs) {
   observer_list_.AddObserver(obs);
 }
 
 void ProfileInfoCache::RemoveObserver(ProfileInfoCacheObserver* obs) {
   observer_list_.RemoveObserver(obs);
 }
 
 void ProfileInfoCache::DeleteProfileFromCache(const FilePath& profile_path) {
-  string16 name = GetNameOfProfileAtIndex(
-      GetIndexOfProfileWithPath(profile_path));
+  size_t profile_index = GetIndexOfProfileWithPath(profile_path);
+  if (profile_index == std::string::npos) {
+    NOTREACHED();
+    return;
+  }
+  string16 name = GetNameOfProfileAtIndex(profile_index);
 
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
                     OnProfileWillBeRemoved(profile_path));
 
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
   DictionaryValue* cache = update.Get();
   std::string key = CacheKeyFromProfilePath(profile_path);
   cache->Remove(key, NULL);
   sorted_keys_.erase(std::find(sorted_keys_.begin(), sorted_keys_.end(), key));
@@ skipping 543 matching lines @@
     info->GetString(kNameKey, &name);
     names.push_back(name);
   }
   return names;
 }
 
 // static
 void ProfileInfoCache::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }