Refactor ProfileInfoCache in c/b/ui/views

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 22 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 using content::BrowserThread;
 
-AvatarMenu::AvatarMenu(ProfileInfoInterface* profile_cache,
+AvatarMenu::AvatarMenu(ProfileAttributesStorage* profile_storage,
                        AvatarMenuObserver* observer,
                        Browser* browser)
-    : profile_list_(ProfileList::Create(profile_cache)),
+    : profile_list_(ProfileList::Create(
+          &g_browser_process->profile_manager()->GetProfileInfoCache())),
       menu_actions_(AvatarMenuActions::Create()),
 #if defined(ENABLE_SUPERVISED_USERS)
       supervised_user_observer_(this),
 #endif
-      profile_info_(profile_cache),
+      profile_info_(
+          &g_browser_process->profile_manager()->GetProfileInfoCache()),
       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);
 
@@ skipping 87 matching lines @@
   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::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();
@@ skipping 97 matching lines @@
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }
 #endif
 
 void AvatarMenu::Update() {
   RebuildMenu();
   if (observer_)
     observer_->OnAvatarMenuChanged(this);
 }