Revert "Refactor ProfileInfoCache in most of c/b/profiles"

chrome/browser/profiles/profile_manager.h

 // Copyright (c) 2012 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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 
 #include <stddef.h>
@@ skipping 10 matching lines @@
 #include "base/message_loop/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class NewProfileLauncher;
-class ProfileAttributesStorage;
 class ProfileInfoCache;
 
 class ProfileManager : public base::NonThreadSafe,
                        public content::NotificationObserver,
                        public Profile::Delegate {
  public:
   typedef base::Callback<void(Profile*, Profile::CreateStatus)> CreateCallback;
   typedef base::Callback<void(Profile*)> ProfileLoadedCallback;
 
   explicit ProfileManager(const base::FilePath& user_data_dir);
@@ skipping 160 matching lines @@
   // Checks if any ephemeral profiles are left behind (e.g. because of a browser
   // crash) and schedule them for deletion.
   void CleanUpEphemeralProfiles();
 
   // Initializes user prefs of |profile|. This includes profile name and
   // avatar values.
   void InitProfileUserPrefs(Profile* profile);
 
   // 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 |addToStorage|, adds to ProfileAttributesStorage as well.
+  // for testing. If |addToCache|, adds to ProfileInfoCache as well.
   // If |start_deferred_task_runners|, starts the deferred task runners.
   // Use ONLY in tests.
   void RegisterTestingProfile(Profile* profile,
-                              bool addToStorage,
+                              bool addToCache,
                               bool start_deferred_task_runners);
 
   const base::FilePath& user_data_dir() const { return user_data_dir_; }
 
   // For ChromeOS, determines if the user has logged in to a real profile.
   bool IsLoggedIn() const { return logged_in_; }
 
   // content::NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
@@ skipping 75 matching lines @@
 
   // Returns ProfileInfo associated with given |path|, registered earlier with
   // RegisterProfile.
   ProfileInfo* GetProfileInfoByPath(const base::FilePath& path) const;
 
   // Returns a registered profile. In contrast to GetProfileByPath(), this will
   // also return a profile that is not fully initialized yet, so this method
   // should be used carefully.
   Profile* GetProfileByPathInternal(const base::FilePath& path) const;
 
-  // Adds |profile| to the profile attributes storage if it hasn't been added
-  // yet.
-  void AddProfileToStorage(Profile* profile);
+  // Adds |profile| to the profile info cache if it hasn't been added yet.
+  void AddProfileToCache(Profile* profile);
 
   // Apply settings for profiles created by the system rather than users: The
   // (desktop) Guest User profile and (desktop) System Profile.
   void SetNonPersonalProfilePrefs(Profile* profile);
 
   // For ChromeOS, determines if profile should be otr.
   bool ShouldGoOffTheRecord(Profile* profile);
 
   void RunCallbacks(const std::vector<CreateCallback>& callbacks,
                     Profile* profile,
@@ skipping 79 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const base::FilePath& user_data_dir);
 
  protected:
   void DoFinalInitForServices(Profile*, bool) override {}
   void DoFinalInitLogging(Profile*) override {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_