Refactor ProfileInfoCache in c/b/profiles

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 b4db4fbcb0e3b288c9597ed570d2f79cdad1bcbe..37f7c8c0c56962b864fef8bf89f19e6fc1d4daa5 100644
--- a/chrome/browser/profiles/profile_manager.h
+++ b/chrome/browser/profiles/profile_manager.h
@@ -28,6 +28,7 @@
 #include "content/public/browser/notification_registrar.h"
 
 class NewProfileLauncher;
+class ProfileAttributesStorage;
 class ProfileInfoCache;
 
 class ProfileManager : public base::NonThreadSafe,
@@ -195,11 +196,11 @@ class ProfileManager : public base::NonThreadSafe,
 
   // Register and add testing profile to the ProfileManager. Use ONLY in tests.
   // This allows the creation of Profiles outside of the standard creation path
-  // for testing. If |addToCache|, adds to ProfileInfoCache as well.
+  // for testing. If |addToStorage|, adds to ProfileAttributesStorage as well.
   // If |start_deferred_task_runners|, starts the deferred task runners.
   // Use ONLY in tests.
   void RegisterTestingProfile(Profile* profile,
-                              bool addToCache,
+                              bool addToStorage,
                               bool start_deferred_task_runners);
 
   const base::FilePath& user_data_dir() const { return user_data_dir_; }
@@ -295,8 +296,9 @@ class ProfileManager : public base::NonThreadSafe,
   // should be used carefully.
   Profile* GetProfileByPathInternal(const base::FilePath& path) const;
 
-  // Adds |profile| to the profile info cache if it hasn't been added yet.
-  void AddProfileToCache(Profile* profile);
+  // Adds |profile| to the profile attributes storage if it hasn't been added
+  // yet.
+  void AddProfileToStorage(Profile* profile);
 
   // Apply settings for profiles created by the system rather than users: The
   // (desktop) Guest User profile and (desktop) System Profile.