Refactor most c/b/profiles calls to ProfileInfoCache.

chrome/browser/profiles/avatar_menu.h

Index: chrome/browser/profiles/avatar_menu.h
diff --git a/chrome/browser/profiles/avatar_menu.h b/chrome/browser/profiles/avatar_menu.h
index 974965ac0a7413cc41af25098dc0d219279c52b1..5b72144e5bee9eb56af8a575060bf38a1956724b 100644
--- a/chrome/browser/profiles/avatar_menu.h
+++ b/chrome/browser/profiles/avatar_menu.h
@@ -27,7 +27,7 @@ class AvatarMenuActions;
 class AvatarMenuObserver;
 class Browser;
 class Profile;
-class ProfileInfoInterface;
+class ProfileAttributesStorage;
 class ProfileList;
 class SupervisedUserService;
 
@@ -44,7 +44,7 @@ class AvatarMenu :
  public:
   // Represents an item in the menu.
   struct Item {
-    Item(size_t menu_index, size_t profile_index, const gfx::Image& icon);
+    Item(size_t menu_index, const gfx::Image& icon);
     ~Item();
 
     // The icon to be displayed next to the item.
@@ -79,16 +79,13 @@ class AvatarMenu :
     // profiles.
     size_t menu_index;
 
-    // The index in the |profile_cache| for this profile.
-    size_t profile_index;
-
     // The path of this profile.
     base::FilePath profile_path;
   };
 
   // Constructor. |observer| can be NULL. |browser| can be NULL and a new one
   // will be created if an action requires it.
-  AvatarMenu(ProfileInfoInterface* profile_cache,
+  AvatarMenu(ProfileAttributesStorage* profile_storage,
              AvatarMenuObserver* observer,
              Browser* browser);
   ~AvatarMenu() override;
@@ -129,6 +126,9 @@ class AvatarMenu :
   // Gets the Item at the specified index.
   const Item& GetItemAt(size_t index) const;
 
+  // Gets the index in this menu for which profile_path is equal to |path|.
+  size_t GetIndexOfItemWithProfilePath(const base::FilePath& path);
+
   // Returns the index of the active profile.
   size_t GetActiveProfileIndex();
 
@@ -186,8 +186,6 @@ class AvatarMenu :
       supervised_user_observer_;
 #endif
 
-  // The cache that provides the profile information. Weak.
-  ProfileInfoInterface* profile_info_;
 
   // The observer of this model, which is notified of changes. Weak.
   AvatarMenuObserver* observer_;