Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/ui/views/frame/browser_non_client_frame_view.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/ui/views/frame/browser_non_client_frame_view.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/profile.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/profiles_state.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/taskbar_decorator.h"
 #include "chrome/browser/ui/views/profiles/avatar_menu_button.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/image/image.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/resources/grit/views_resources.h"
 
 BrowserNonClientFrameView::BrowserNonClientFrameView(BrowserFrame* frame,
                                                      BrowserView* browser_view)
     : frame_(frame),
-      browser_view_(browser_view),
-      avatar_button_(nullptr) {
+      browser_view_(browser_view) {
   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    cache.AddObserver(this);
+    g_browser_process->profile_manager()->
+        GetProfileAttributesStorage().AddObserver(this);
   }
 }
 
 BrowserNonClientFrameView::~BrowserNonClientFrameView() {
   // The profile manager may by null in tests.
   if (g_browser_process->profile_manager()) {
-    ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-    cache.RemoveObserver(this);
+    g_browser_process->profile_manager()->
+        GetProfileAttributesStorage().RemoveObserver(this);
   }
 }
 
 void BrowserNonClientFrameView::OnBrowserViewInitViewsComplete() {}
 
 void BrowserNonClientFrameView::UpdateToolbar() {
 }
 
 views::View* BrowserNonClientFrameView::GetLocationIconView() const {
   return nullptr;
@@ skipping 166 matching lines @@
     // pinned the badge-less Chrome shortcut which will cause windows to ignore
     // the relaunch details.
     // TODO(calamity): ideally this should not be necessary but due to issues
     // with the default shortcut being pinned, we add the runtime badge for
     // safety. See crbug.com/313800.
     bool show_decoration = AvatarMenu::ShouldShowAvatarMenu() &&
         !browser_view_->browser()->profile()->IsGuestSession();
     // In tests, make sure that the browser process and profile manager are
     // valid before using.
     if (g_browser_process && g_browser_process->profile_manager()) {
-      const ProfileInfoCache& cache =
-          g_browser_process->profile_manager()->GetProfileInfoCache();
-      show_decoration = show_decoration && cache.GetNumberOfProfiles() > 1;
+      const ProfileAttributesStorage& storage =
+          g_browser_process->profile_manager()->GetProfileAttributesStorage();
+      show_decoration = show_decoration && storage.GetNumberOfProfiles() > 1;
     }
     chrome::DrawTaskbarDecoration(frame_->GetNativeWindow(),
         show_decoration
             ? (taskbar_badge_avatar.IsEmpty() ? &avatar : &taskbar_badge_avatar)
             : nullptr);
   }
 }