Multi-Profiles: Fix choosing random profile avatar

chrome/browser/profiles/profile_info_cache.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 44 matching lines @@
   void SetNameOfProfileAtIndex(size_t index, const string16& name);
   void SetUserNameOfProfileAtIndex(size_t index, const string16& user_name);
   void SetAvatarIconOfProfileAtIndex(size_t index, size_t icon_index);
 
   // Returns unique name that can be assigned to a newly created profile.
   string16 ChooseNameForNewProfile();
 
   // Returns an avatar icon index that can be assigned to a newly created
   // profile. Note that the icon may not be unique since there are a limited
   // set of default icons.
-  int ChooseAvatarIconIndexForNewProfile();
+  size_t ChooseAvatarIconIndexForNewProfile() const;
 
   const FilePath& GetUserDataDir() const;
 
   // Gets the number of default avatar icons that exist.
   static size_t GetDefaultAvatarIconCount();
   // Gets the resource ID of the default avatar icon at |index|.
   static int GetDefaultAvatarIconResourceIDAtIndex(size_t index);
   // Returns a URL for the default avatar icon with specified index.
   static std::string GetDefaultAvatarIconUrl(size_t index);
   // Checks if the given URL points to one of the default avatar icons. If it
   // is, returns true and its index through |icon_index|. If not, returns false.
   static bool IsDefaultAvatarIconUrl(const std::string& icon_url,
                                      size_t *icon_index);
 
   // Register cache related preferences in Local State.
   static void RegisterPrefs(PrefService* prefs);
 
  private:
   const base::DictionaryValue* GetInfoForProfileAtIndex(size_t index) const;
   // Saves the profile info to a cache and takes ownership of |info|.
   // Currently the only information that is cached is the profiles name and
   // avatar icon.
   void SetInfoForProfileAtIndex(size_t index, base::DictionaryValue* info);
   std::string CacheKeyFromProfilePath(const FilePath& profile_path) const;
   std::vector<std::string>::iterator FindPositionForProfile(
       std::string search_key,
       const string16& search_name);
 
+  // Returns true if the given icon index is not in use by another profie.
+  bool IconIndexIsUnique(size_t icon_index) const;
+
+  // Tries to find an icon index that satisfies all the given conditions.
+  // Returns true if an icon was found, false otherwise.
+  bool ChooseAvatarIconIndexForNewProfile(bool allow_generic_icon,
+                                          bool must_be_unique,
+                                          size_t* out_icon_index) const;
+
   PrefService* prefs_;
   std::vector<std::string> sorted_keys_;
   FilePath user_data_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileInfoCache);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_