Revert 97049 - Trying to see if it fixes sync_integration_tests

chrome/browser/ui/profile_menu_model.cc

 // Copyright (c) 2011 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/profile_menu_model.h"
 
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 46 matching lines @@
 
   virtual bool DeleteAfter() OVERRIDE { return true; }
 };
 
 SwitchProfileMenuModel::SwitchProfileMenuModel(
     ui::SimpleMenuModel::Delegate* delegate,
     Browser* browser)
     : 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,
                  cache.GetNameOfProfileAtIndex(i));
   }
 
   AddSeparator();
 
   AddItemWithStringId(ProfileMenuModel::COMMAND_CREATE_NEW_PROFILE,
                       IDS_PROFILES_CREATE_NEW_PROFILE_OPTION);
 }
 
 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);
     ProfileSwitchObserver* observer = new ProfileSwitchObserver;
     // The observer is deleted by the manager when profile creation is finished.
     g_browser_process->profile_manager()->CreateProfileAsync(
         profile_path, observer);
   } else {
     delegate_->ExecuteCommand(command_id);
   }
 }
 
 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;
     PathService::Get(chrome::DIR_USER_DATA, &userDataFolder);
     FilePath profile_path = cache.GetPathOfProfileAtIndex(index);
     return browser_->GetProfile()->GetPath() == profile_path;
   }
   return delegate_->IsCommandIdChecked(command_id);
 }
 
@@ skipping 19 matching lines @@
     int command_id) const {
   DCHECK(IsSwitchProfileCommand(command_id));
   return command_id - ProfileMenuModel::COMMAND_SWITCH_TO_PROFILE;
 }
 
 } // namespace
 
 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));
 
   // TODO(sail): Need to implement an icon chooser on other platforms too.
 #if defined(TOOLKIT_VIEWS)
   AddItem(COMMAND_CHOOSE_AVATAR_ICON, string16());
 #endif
 
   AddItemWithStringId(COMMAND_CUSTOMIZE_PROFILE,
@@ skipping 42 matching lines @@
     case COMMAND_CHOOSE_AVATAR_ICON:
       break;
     case COMMAND_CREATE_NEW_PROFILE:
       ProfileManager::CreateMultiProfileAsync();
       break;
     default:
       NOTREACHED();
       break;
   }
 }