Revert 97049 - Trying to see if it fixes sync_integration_tests

chrome/browser/profiles/profile_manager.cc

Index: chrome/browser/profiles/profile_manager.cc
===================================================================
--- chrome/browser/profiles/profile_manager.cc	(revision 97074)
+++ chrome/browser/profiles/profile_manager.cc	(working copy)
@@ -503,11 +503,7 @@
   return profiles;
 }
 
-ProfileInfoInterface& ProfileManager::GetProfileInfo() {
-  return GetMutableProfileInfo();
-}
-
-ProfileInfoCache& ProfileManager::GetMutableProfileInfo() {
+ProfileInfoCache& ProfileManager::GetProfileInfoCache() {
   if (!profile_info_cache_.get()) {
     FilePath user_data_dir;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
@@ -518,7 +514,7 @@
 }
 
 void ProfileManager::AddProfileToCache(Profile* profile) {
-  ProfileInfoCache& cache = GetMutableProfileInfo();
+  ProfileInfoCache& cache = GetProfileInfoCache();
   if (profile->GetPath().DirName() != cache.GetUserDataDir())
     return;
 
@@ -557,12 +553,13 @@
   if (profile)
     BrowserList::CloseAllBrowsersWithProfile(profile);
   profiles_to_delete_.push_back(profile_dir);
-  GetMutableProfileInfo().DeleteProfileFromCache(profile_dir);
+  ProfileInfoCache& cache = GetProfileInfoCache();
+  cache.DeleteProfileFromCache(profile_dir);
 }
 
 // static
 bool ProfileManager::IsMultipleProfilesEnabled() {
-#if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+#if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
   return true;
 #endif
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);