[Profiles] Fix the usage of custom/default names and avatars

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"
 
@@ skipping 23 matching lines @@
 // custom name.
 base::string16 GetAvatarNameForProfile(const base::FilePath& profile_path);
 
 // 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);
 
 // 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);
 
 // If the --google-profile-info flag is turned on, starts an update for a new
 // version of the Gaia profile picture.
 void UpdateGaiaProfilePhotoIfNeeded(Profile* profile);
 
 // Returns the sign-in error controller for the given profile.  Some profiles,
 // like guest profiles, may not have a controller so this function may return
 // NULL.
 SigninErrorController* GetSigninErrorController(Profile* profile);
 
 }  // namespace profiles
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILES_STATE_H_