[Profiles] Don't treat GAIA names differently than regular profile names.

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 66 matching lines @@
       display_name = l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME);
     } else {
       display_name = profile_name;
     }
   }
   return display_name;
 }
 
 void UpdateProfileName(Profile* profile,
                        const base::string16& new_profile_name) {
-  ProfileInfoCache& cache =
-        g_browser_process->profile_manager()->GetProfileInfoCache();
-  base::FilePath profile_file_path = profile->GetPath();
-  size_t profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
-
-  if ((new_profile_name ==
-          cache.GetGAIAGivenNameOfProfileAtIndex(profile_index)) ||
-      (new_profile_name == cache.GetGAIANameOfProfileAtIndex(profile_index))) {
-    // Set the profile to use the GAIA name as the profile name. Note, this
-    // is a little weird if the user typed their GAIA name manually but
-    // it's not a big deal.
-    cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, true);
-  } else {
-    PrefService* pref_service = profile->GetPrefs();
-    // Updating the profile preference will cause the cache to be updated for
-    // this preference.
-    pref_service->SetString(prefs::kProfileName,
-                            base::UTF16ToUTF8(new_profile_name));
-
-    // Changing the profile name can invalidate the profile index.
-    profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
-    if (profile_index == std::string::npos)
-      return;
-
-    cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, false);
-  }
+  PrefService* pref_service = profile->GetPrefs();
+  // Updating the profile preference will cause the cache to be updated for
+  // this preference.
+  pref_service->SetString(prefs::kProfileName,
+                          base::UTF16ToUTF8(new_profile_name));

[rpetterson, 2014/03/20 22:58:17]

Do you need to know if it's a GAIA name or custom name?

[noms (inactive), 2014/03/21 14:32:00]

You don't. You're just updating the display, custom name, since the Gaia name is
saved separately. 

On 2014/03/20 22:58:17, rpetterson wrote:

 }
 
 std::vector<std::string> GetSecondaryAccountsForProfile(
     Profile* profile,
     const std::string& primary_account) {
   std::vector<std::string> accounts =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->GetAccounts();
 
   // The vector returned by ProfileOAuth2TokenService::GetAccounts() contains
   // the primary account too, so we need to remove it from the list.
   std::vector<std::string>::iterator primary_index =
       std::find_if(accounts.begin(), accounts.end(),
                    std::bind1st(std::equal_to<std::string>(), primary_account));
   DCHECK(primary_index != accounts.end());
   accounts.erase(primary_index);
 
   return accounts;
 }
 
 bool IsRegularOrGuestSession(Browser* browser) {
   Profile* profile = browser->profile();
   return profile->IsGuestSession() || !profile->IsOffTheRecord();
 }
 
 }  // namespace profiles