Refactor most c/b/profiles calls to ProfileInfoCache.

chrome/browser/profiles/avatar_menu.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/avatar_menu.h"
 
 #include "base/bind.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/profiler/scoped_tracker.h"
@@ skipping 29 matching lines @@
 using content::BrowserThread;
 
 namespace {
 
 // Constants for the show profile switcher experiment
 const char kShowProfileSwitcherFieldTrialName[] = "ShowProfileSwitcher";
 const char kAlwaysShowSwitcherGroupName[] = "AlwaysShow";
 
 }  // namespace
 
-AvatarMenu::AvatarMenu(ProfileInfoInterface* profile_cache,
+AvatarMenu::AvatarMenu(ProfileAttributesStorage* profile_storage,
                        AvatarMenuObserver* observer,
                        Browser* browser)
-    : profile_list_(ProfileList::Create(profile_cache)),
+    : profile_list_(ProfileList::Create(profile_storage)),
       menu_actions_(AvatarMenuActions::Create()),
 #if defined(ENABLE_SUPERVISED_USERS)
       supervised_user_observer_(this),
 #endif
-      profile_info_(profile_cache),
       observer_(observer),
       browser_(browser) {
-  DCHECK(profile_info_);
   // Don't DCHECK(browser_) so that unit tests can reuse this ctor.
 
   ActiveBrowserChanged(browser_);
 
   // Register this as an observer of the info cache.
-  g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
+  g_browser_process->profile_manager()->

[Mike Lerman, 2015/08/06 16:06:19]

The ctor was passed a ProfileAttributesStorage; why go through the
ProfileManager to get the reference?

+      GetProfileAttributesStorage().AddObserver(this);
 
 #if defined(ENABLE_SUPERVISED_USERS)
   // Register this as an observer of the SupervisedUserService to be notified
   // of changes to the custodian info.
   if (browser_) {
     supervised_user_observer_.Add(
         SupervisedUserServiceFactory::GetForProfile(browser_->profile()));
   }
 #endif
 }
 
 AvatarMenu::~AvatarMenu() {
   g_browser_process->profile_manager()->
-      GetProfileInfoCache().RemoveObserver(this);
+      GetProfileAttributesStorage().RemoveObserver(this);
 }
 
 AvatarMenu::Item::Item(size_t menu_index,
-                       size_t profile_index,
                        const gfx::Image& icon)
     : icon(icon),
       active(false),
       signed_in(false),
       signin_required(false),
-      menu_index(menu_index),
-      profile_index(profile_index) {
+      menu_index(menu_index) {
 }
 
 AvatarMenu::Item::~Item() {
 }
 
 // static
 bool AvatarMenu::ShouldShowAvatarMenu() {
   if (base::FieldTrialList::FindFullName(kShowProfileSwitcherFieldTrialName) ==
       kAlwaysShowSwitcherGroupName) {
     // We should only be in this group when multi-profiles is enabled.
@@ skipping 32 matching lines @@
   if (switches::IsNewAvatarMenu()) {
     // Don't open a browser window for signed-out profiles.
     if (item.signin_required) {
       UserManager::Show(item.profile_path,
                         profiles::USER_MANAGER_NO_TUTORIAL,
                         profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
       return;
     }
   }
 
-  base::FilePath path =
-      profile_info_->GetPathOfProfileAtIndex(item.profile_index);
-
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   if (browser_)
     desktop_type = browser_->host_desktop_type();
 
-  profiles::SwitchToProfile(path, desktop_type, always_create,
+  profiles::SwitchToProfile(item.profile_path, desktop_type, always_create,
                             ProfileManager::CreateCallback(),
                             metric);
 }
 
 void AvatarMenu::AddNewProfile(ProfileMetrics::ProfileAdd type) {
   menu_actions_->AddNewProfile(type);
 }
 
 void AvatarMenu::EditProfile(size_t index) {
-  // Get the index in the profile cache from the menu index.
-  size_t profile_index = profile_list_->GetItemAt(index).profile_index;
-
+  base::FilePath profile_path = profile_list_->GetItemAt(index).profile_path;
   Profile* profile = g_browser_process->profile_manager()->GetProfileByPath(
-        profile_info_->GetPathOfProfileAtIndex(profile_index));
-
-  menu_actions_->EditProfile(profile, profile_index);
+        profile_path);

[Mike Lerman, 2015/08/06 16:06:19]

Don't need to declare a FilePath, you can just inline the
GetItemAt().profile_path.

+  menu_actions_->EditProfile(profile);
 }
 
 void AvatarMenu::RebuildMenu() {
   profile_list_->RebuildMenu();
 }
 
 size_t AvatarMenu::GetNumberOfItems() const {
   return profile_list_->GetNumberOfItems();
 }
 
 const AvatarMenu::Item& AvatarMenu::GetItemAt(size_t index) const {
   return profile_list_->GetItemAt(index);
 }
+
+size_t AvatarMenu::GetIndexOfItemWithProfilePath(const base::FilePath& path) {
+  return profile_list_->MenuIndexFromProfilePath(path);
+}
+
 size_t AvatarMenu::GetActiveProfileIndex() {
 
   // During singleton profile deletion, this function can be called with no
   // profiles in the model - crbug.com/102278 .
   if (profile_list_->GetNumberOfItems() == 0)
     return 0;
 
   Profile* active_profile = NULL;
   if (!browser_)
     active_profile = ProfileManager::GetLastUsedProfile();
   else
     active_profile = browser_->profile();
 
   size_t index =
-      profile_info_->GetIndexOfProfileWithPath(active_profile->GetPath());
-
-  index = profile_list_->MenuIndexFromProfileIndex(index);
+      profile_list_->MenuIndexFromProfilePath(active_profile->GetPath());
   DCHECK_LT(index, profile_list_->GetNumberOfItems());
   return index;
 }
 
 base::string16 AvatarMenu::GetSupervisedUserInformation() const {
   // |browser_| can be NULL in unit_tests.
   if (browser_ && browser_->profile()->IsSupervised()) {
 #if defined(ENABLE_SUPERVISED_USERS)
     SupervisedUserService* service =
         SupervisedUserServiceFactory::GetForProfile(browser_->profile());
@@ skipping 90 matching lines @@
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }
 #endif
 
 void AvatarMenu::Update() {
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }