Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/ui/views/profiles/avatar_menu_button.cc

 // Copyright 2014 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/ui/views/profiles/avatar_menu_button.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_attributes_entry.h"
+#include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/theme_resources.h"
@@ skipping 83 matching lines @@
     // TODO(nkostylev): Allow this on ChromeOS once the ChromeOS test
     // environment handles profile directories correctly.
 #if !defined(OS_CHROMEOS)
     bool is_badge_rectangle = false;
     // The taskbar badge should be the profile avatar, not the OTR avatar.
     AvatarMenu::GetImageForMenuButton(profile->GetPath(),
                                       taskbar_badge_avatar,
                                       &is_badge_rectangle);
 #endif
   } else if (should_show_avatar_menu) {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath());
-    if (index == std::string::npos)
+    ProfileAttributesEntry* entry;
+    if (!g_browser_process->profile_manager()->GetProfileAttributesStorage().
+        GetProfileAttributesWithPath(profile->GetPath(), &entry))
       return false;
 
 #if defined(OS_CHROMEOS)
     AvatarMenu::GetImageForMenuButton(profile->GetPath(), avatar, is_rectangle);
 #else
-    *avatar = cache.GetAvatarIconOfProfileAtIndex(index);
+    *avatar = entry->GetAvatarIcon();
     // TODO(noms): Once the code for the old avatar menu button is removed,
     // this function will only be called for badging the taskbar icon.  The
     // function can be renamed to something like GetAvatarImageForBadging()
     // and only needs to return the avatar from
     // AvatarMenu::GetImageForMenuButton().
     bool is_badge_rectangle = false;
     AvatarMenu::GetImageForMenuButton(profile->GetPath(),
                                       taskbar_badge_avatar,
                                       &is_badge_rectangle);
 #endif
   }
   return true;
 }
 
 // views::ViewTargeterDelegate:
 bool AvatarMenuButton::DoesIntersectRect(const views::View* target,
                                          const gfx::Rect& rect) const {
   CHECK_EQ(target, this);
   return enabled_ &&
          views::ViewTargeterDelegate::DoesIntersectRect(target, rect);
 }
 
 // views::MenuButtonListener implementation
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (enabled_)
     chrome::ShowAvatarMenu(browser_view_->browser());
 }