This changes ProfileManager::GetProfileInfoCache() to be GetProfileInfo() and

chrome/browser/profiles/profile_manager.h

Index: chrome/browser/profiles/profile_manager.h
diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h
index ad3dc469f5232029b8b771393f9b57f8e9b91de7..fcebda697110b41d3ff40c3e97bb5cc269842a00 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -26,6 +26,7 @@
 class FilePath;
 class NewProfileLauncher;
 class ProfileInfoCache;
+class ProfileInfoInterface;
 
 class ProfileManagerObserver {
  public:
@@ -157,9 +158,14 @@ class ProfileManager : public base::NonThreadSafe,
   // Register multi-profile related preferences in Local State.
   static void RegisterPrefs(PrefService* prefs);
 
-  // Returns a ProfileInfoCache object which can be used to get information
+  // Returns a ProfileInfoInterface object which can be used to get information
   // about profiles without having to load them from disk.
-  ProfileInfoCache& GetProfileInfoCache();
+  virtual ProfileInfoInterface& GetProfileInfo();
+
+  // Returns the ProfileInfoInterface as a mutable ProfileInfoCache. This should
+  // only be used when you need the full set of methods. Wherever possible use
+  // the ProfileInfoInterface.
+  virtual ProfileInfoCache& GetMutableProfileInfo();
 
   // Schedules the profile at the given path to be deleted on shutdown.
   void ScheduleProfileForDeletion(const FilePath& profile_dir);