Refactor most c/b/profiles calls to ProfileInfoCache.

chrome/browser/profiles/profile_info_cache.h

Index: chrome/browser/profiles/profile_info_cache.h
diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h
index 6969344dc23d6e5542c223710489c206406a0cbe..a99094ceb43e710864d8f64b80ffcabfc93c9215 100644
--- a/chrome/browser/profiles/profile_info_cache.h
+++ b/chrome/browser/profiles/profile_info_cache.h
@@ -135,17 +135,17 @@ class ProfileInfoCache : public ProfileInfoInterface,
   void SetProfileIsAuthErrorAtIndex(size_t index, bool value);
 
   // Determines whether |name| is one of the default assigned names.
-  bool IsDefaultProfileName(const base::string16& name) const;
+  bool IsDefaultProfileName(const base::string16& name) const override;
 
   // Returns unique name that can be assigned to a newly created profile.
-  base::string16 ChooseNameForNewProfile(size_t icon_index) const;
+  base::string16 ChooseNameForNewProfile(size_t icon_index) const override;
 
   // 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.
   size_t ChooseAvatarIconIndexForNewProfile() const;
 
-  const base::FilePath& GetUserDataDir() const;
+  const base::FilePath& GetUserDataDir() const override;
 
   // Register cache related preferences in Local State.
   static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -161,10 +161,10 @@ class ProfileInfoCache : public ProfileInfoInterface,
   void SaveAvatarImageAtPath(const gfx::Image* image,
                              const std::string& key,
                              const base::FilePath& image_path,
-                             const base::FilePath& profile_path);
+                             const base::FilePath& profile_path) override;
 
-  void AddObserver(ProfileInfoCacheObserver* obs);
-  void RemoveObserver(ProfileInfoCacheObserver* obs);
+  void AddObserver(ProfileInfoCacheObserver* obs) override;
+  void RemoveObserver(ProfileInfoCacheObserver* obs) override;
 
   void set_disable_avatar_download_for_testing(
       bool disable_avatar_download_for_testing) {
@@ -186,6 +186,7 @@ class ProfileInfoCache : public ProfileInfoInterface,
       const base::FilePath& path,
       ProfileAttributesEntry** entry) override;
 
+  std::string CacheKeyFromProfilePath(const base::FilePath& profile_path) const;
  private:
   FRIEND_TEST_ALL_PREFIXES(ProfileInfoCacheTest, DownloadHighResAvatarTest);
   FRIEND_TEST_ALL_PREFIXES(ProfileInfoCacheTest,
@@ -194,7 +195,6 @@ class ProfileInfoCache : public ProfileInfoInterface,
   const base::DictionaryValue* GetInfoForProfileAtIndex(size_t index) const;
   // Saves the profile info to a cache and takes ownership of |info|.
   void SetInfoForProfileAtIndex(size_t index, base::DictionaryValue* info);
-  std::string CacheKeyFromProfilePath(const base::FilePath& profile_path) const;
   std::vector<std::string>::iterator FindPositionForProfile(
       const std::string& search_key,
       const base::string16& search_name);