Revert 97049 - Trying to see if it fixes sync_integration_tests

chrome/browser/ui/profile_menu_model.cc

Index: chrome/browser/ui/profile_menu_model.cc
===================================================================
--- chrome/browser/ui/profile_menu_model.cc	(revision 97074)
+++ chrome/browser/ui/profile_menu_model.cc	(working copy)
@@ -64,8 +64,8 @@
     : SimpleMenuModel(this),
       browser_(browser),
       delegate_(delegate) {
-  ProfileInfoInterface& cache =
-      g_browser_process->profile_manager()->GetProfileInfo();
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t count = cache.GetNumberOfProfiles();
   for (size_t i = 0; i < count; ++i) {
     AddCheckItem(ProfileMenuModel::COMMAND_SWITCH_TO_PROFILE + i,
@@ -79,8 +79,8 @@
 }
 
 void SwitchProfileMenuModel::ExecuteCommand(int command_id) {
-  ProfileInfoInterface& cache =
-      g_browser_process->profile_manager()->GetProfileInfo();
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
   if (IsSwitchProfileCommand(command_id)) {
     size_t index = GetProfileIndexFromSwitchProfileCommand(command_id);
     FilePath profile_path = cache.GetPathOfProfileAtIndex(index);
@@ -94,8 +94,8 @@
 }
 
 bool SwitchProfileMenuModel::IsCommandIdChecked(int command_id) const {
-  ProfileInfoInterface& cache =
-      g_browser_process->profile_manager()->GetProfileInfo();
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
   if (IsSwitchProfileCommand(command_id)) {
     size_t index = GetProfileIndexFromSwitchProfileCommand(command_id);
     FilePath userDataFolder;
@@ -135,8 +135,8 @@
 ProfileMenuModel::ProfileMenuModel(Browser* browser)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       browser_(browser) {
-  ProfileInfoInterface& cache =
-      g_browser_process->profile_manager()->GetProfileInfo();
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(
       browser_->profile()->GetPath());
   AddItem(COMMAND_PROFILE_NAME, cache.GetNameOfProfileAtIndex(profile_index));