Refactor most c/b/profiles calls to ProfileInfoCache.

chrome/browser/profiles/profile_list_desktop.h

Index: chrome/browser/profiles/profile_list_desktop.h
diff --git a/chrome/browser/profiles/profile_list_desktop.h b/chrome/browser/profiles/profile_list_desktop.h
index ef9ca8e6c968b641d73e9c6c4c887e637a451ace..2eca2be8078027153cc06be0e5bfc73f3883ad75 100644
--- a/chrome/browser/profiles/profile_list_desktop.h
+++ b/chrome/browser/profiles/profile_list_desktop.h
@@ -10,31 +10,32 @@
 #include <vector>
 
 class Browser;
-class ProfileInfoInterface;
+class ProfileAttributesStorage;
 
 // This model represents the profiles added to desktop Chrome (as opposed to
 // Chrome OS). Profiles marked not to appear in the list will be omitted
 // throughout.
 class ProfileListDesktop : public ProfileList {
  public:
-  explicit ProfileListDesktop(ProfileInfoInterface* profile_cache);
+  explicit ProfileListDesktop(ProfileAttributesStorage* profile_storage);
   ~ProfileListDesktop() override;
 
   // ProfileList overrides:
   size_t GetNumberOfItems() const override;
   const AvatarMenu::Item& GetItemAt(size_t index) const override;
   void RebuildMenu() override;
-  // Returns the menu index of the profile at |index| in the ProfileInfoCache.
-  // The profile index must exist, and it may not be marked as omitted from the
-  // menu.
-  size_t MenuIndexFromProfileIndex(size_t index) override;
+  // Returns the menu index of the profile at |path| in the
+  // ProfileAttributesStorage.
+  // The profile path must exist, and it may not be marked as omitted from the
+  // menu. Otherwise, the behavior is undefined.
+  size_t MenuIndexFromProfilePath(const base::FilePath& path) override;
   void ActiveProfilePathChanged(base::FilePath& path) override;
 
  private:
   void ClearMenu();
 
   // The cache that provides the profile information. Weak.
-  ProfileInfoInterface* profile_info_;
+  ProfileAttributesStorage* profile_storage_;
 
   // The path of the currently active profile.
   base::FilePath active_profile_path_;
@@ -42,9 +43,6 @@ class ProfileListDesktop : public ProfileList {
   // List of built "menu items."
   std::vector<AvatarMenu::Item*> items_;
 
-  // The number of profiles that were omitted from the list when it was built.
-  size_t omitted_item_count_;
-
   DISALLOW_COPY_AND_ASSIGN(ProfileListDesktop);
 };