Revert 97049 - Trying to see if it fixes sync_integration_tests

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 485 matching lines @@
 #endif
 
     // Pending, need to insert it alphabetically.
     profiles.push_back(std::pair<FilePath, string16>(file_path, name));
   }
 
   std::sort(profiles.begin(), profiles.end(), CompareProfilePathAndName);
   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);
     profile_info_cache_.reset(new ProfileInfoCache(
         g_browser_process->local_state(), user_data_dir));
   }
   return *profile_info_cache_.get();
 }
 
 void ProfileManager::AddProfileToCache(Profile* profile) {
-  ProfileInfoCache& cache = GetMutableProfileInfo();
+  ProfileInfoCache& cache = GetProfileInfoCache();
   if (profile->GetPath().DirName() != cache.GetUserDataDir())
     return;
 
   if (cache.GetIndexOfProfileWithPath(profile->GetPath()) != std::string::npos)
     return;
 
   if (profile->GetPath() == GetDefaultProfileDir(cache.GetUserDataDir())) {
     cache.AddProfileToCache(
         profile->GetPath(),
         l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME), 0);
@@ skipping 18 matching lines @@
   return go_off_the_record;
 }
 
 void ProfileManager::ScheduleProfileForDeletion(const FilePath& profile_dir) {
   // TODO(sail): Due to bug 88586 we don't delete the profile instance. Once we
   // start deleting the profile instance we need to close background apps too.
   Profile* profile = GetProfileByPath(profile_dir);
   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);
 }