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

chrome/browser/profiles/profiles_state.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILES_STATE_H_
 #define CHROME_BROWSER_PROFILES_PROFILES_STATE_H_
 
 #include <vector>
 #include "base/strings/string16.h"
 #include "chrome/browser/profiles/avatar_menu.h"
@@ skipping 26 matching lines @@
 
 // Returns the string to use in the avatar button for the specified profile.
 // This is essentially the name returned by GetAvatarNameForProfile, but it
 // may be elided and contain an indicator for supervised users.
 base::string16 GetAvatarButtonTextForProfile(Profile* profile);
 
 // Returns the string to use in the fast user switcher menu for the specified
 // menu item. Adds a supervision indicator to the profile name if appropriate.
 base::string16 GetProfileSwitcherTextForItem(const AvatarMenu::Item& item);
 
-// Update the name of |profile| to |new_profile_name|. This updates the profile
-// preferences, which triggers an update in the ProfileAttributesStorage. This
-// method should be called when the user is explicitely changing the profile
-// name, as it will always set |prefs::kProfileUsingDefaultName| to false.
+// Update the name of |profile| to |new_profile_name|. This updates the
+// profile preferences, which triggers an update in the ProfileInfoCache.
+// This method should be called when the user is explicitely changing
+// the profile name, as it will always set |prefs::kProfileUsingDefaultName|
+// to false.
 void UpdateProfileName(Profile* profile,
                        const base::string16& new_profile_name);
 
 // Returns the list of secondary accounts for a specific |profile|, which is
 // all the email addresses associated with the profile that are not equal to
 // the |primary_account|.
 std::vector<std::string> GetSecondaryAccountsForProfile(
     Profile* profile,
     const std::string& primary_account);
 
 // Returns whether the |browser|'s profile is a non-incognito or guest profile.
 // The distinction is needed because guest profiles are implemented as
 // incognito profiles.
 bool IsRegularOrGuestSession(Browser* browser);
 
 // Returns true if sign in is required to browse as this profile.  Call with
 // profile->GetPath() if you have a profile pointer.
 // TODO(mlerman): Refactor appropriate calls to
-// ProfileAttributesStorage::IsSigninRequired to call here instead.
-bool IsProfileLocked(const base::FilePath& profile_path);
+// ProfileInfoCache::ProfileIsSigninRequiredAtIndex to call here instead.
+bool IsProfileLocked(const base::FilePath& path);
 
 // If the lock-enabled information for this profile is not up to date, starts
 // an update for the Gaia profile info.
 void UpdateIsProfileLockEnabledIfNeeded(Profile* profile);
 
 // If the --google-profile-info flag is turned on, starts an update for a new
 // version of the Gaia profile picture and other profile info.
 void UpdateGaiaProfileInfoIfNeeded(Profile* profile);
 
 // Returns the sign-in error controller for the given profile.  Some profiles,
@@ skipping 18 matching lines @@
 // dismissed by a user, false otherwise.
 bool GetFastUserSwitchingTutorialDismissedState();
 
 // Sets the last used profile pref to |profile_dir|, unless |profile_dir| is the
 // System Profile directory, which is an invalid last used profile.
 void SetLastUsedProfile(const std::string& profile_dir);
 
 }  // namespace profiles
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILES_STATE_H_