Refactor ProfileInfoCache in c/b/ui/views

chrome/browser/ui/views/frame/global_menu_bar_x11.cc

 // Copyright 2013 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/global_menu_bar_x11.h"
 
 #include <dlfcn.h>
 #include <glib-object.h>
 #include <stddef.h>
 
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_live_tab_context.h"
 #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_x11.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h"
@@ skipping 402 matching lines @@
     GetTopSitesData();
 
     // Register as TopSitesObserver so that we can update ourselves when the
     // TopSites changes.
     scoped_observer_.Add(top_sites_.get());
   }
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
   avatar_menu_.reset(new AvatarMenu(
-      &profile_manager->GetProfileInfoCache(), this, nullptr));
+      &profile_manager->GetProfileAttributesStorage(), this, nullptr));
   avatar_menu_->RebuildMenu();
   BrowserList::AddObserver(this);
 
   RebuildProfilesMenu();
 
   server_set_root(server_, root_item_);
 }
 
 void GlobalMenuBarX11::Disable() {
   for (CommandIDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
@@ skipping 437 matching lines @@
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), kProfileId));
   avatar_menu_->EditProfile(id);
 }
 
 void GlobalMenuBarX11::OnCreateProfileItemActivated(DbusmenuMenuitem* sender,
                                                     unsigned int timestamp) {
   profiles::CreateAndSwitchToNewProfile(chrome::HOST_DESKTOP_TYPE_NATIVE,
                                         ProfileManager::CreateCallback(),
                                         ProfileMetrics::ADD_NEW_USER_MENU);
 }