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

chrome/browser/profiles/profiles_state.cc

 // 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.
 
 #include "chrome/browser/profiles/profiles_state.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 80 matching lines @@
   if (profile->IsSupervised()) {
     name = l10n_util::GetStringFUTF16(IDS_SUPERVISED_USER_NEW_AVATAR_LABEL,
                                       name);
   }
   return name;
 }
 
 void UpdateProfileName(Profile* profile,
                        const base::string16& new_profile_name) {
   PrefService* pref_service = profile->GetPrefs();
+  ProfileInfoCache& cache =
+      g_browser_process->profile_manager()->GetProfileInfoCache();
+
+  // Check whether the user has specifically chosen to use a default profile
+  // name.
+  size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
+  if (profile_index != std::string::npos) {
+    pref_service->SetInteger(prefs::kProfileUsingDefaultName,
+        cache.IsDefaultProfileName(new_profile_name) ? 1 : 0);
+  }
+
   // Updating the profile preference will cause the cache to be updated for
   // this preference.
   pref_service->SetString(prefs::kProfileName,
                           base::UTF16ToUTF8(new_profile_name));
 }
 
 std::vector<std::string> GetSecondaryAccountsForProfile(
     Profile* profile,
     const std::string& primary_account) {
   std::vector<std::string> accounts =
@@ skipping 25 matching lines @@
   GAIAInfoUpdateServiceFactory::GetInstance()->GetForProfile(profile)->Update();
 }
 
 SigninErrorController* GetSigninErrorController(Profile* profile) {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   return token_service ? token_service->signin_error_controller() : NULL;
 }
 
 }  // namespace profiles