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

chrome/browser/profiles/profile_info_cache.cc

 // 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.
 
 #include "chrome/browser/profiles/profile_info_cache.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 24 matching lines @@
 #include "ui/gfx/image/image_util.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kNameKey[] = "name";
 const char kShortcutNameKey[] = "shortcut_name";
 const char kGAIANameKey[] = "gaia_name";
 const char kGAIAGivenNameKey[] = "gaia_given_name";
-const char kUseGAIANameKey[] = "use_gaia_name";
 const char kUserNameKey[] = "user_name";
 const char kIsUsingDefaultName[] = "is_using_default_name";
 const char kAvatarIconKey[] = "avatar_icon";
 const char kAuthCredentialsKey[] = "local_auth_credentials";
 const char kUseGAIAPictureKey[] = "use_gaia_picture";
 const char kBackgroundAppsKey[] = "background_apps";
-const char kHasMigratedToGAIAInfoKey[] = "has_migrated_to_gaia_info";
 const char kGAIAPictureFileNameKey[] = "gaia_picture_file_name";
 const char kIsManagedKey[] = "is_managed";
 const char kIsOmittedFromProfileListKey[] = "is_omitted_from_profile_list";
 const char kSigninRequiredKey[] = "signin_required";
 const char kManagedUserId[] = "managed_user_id";
 const char kProfileIsEphemeral[] = "is_ephemeral";
 const char kActiveTimeKey[] = "active_time";
 
 const char kDefaultUrlPrefix[] = "chrome://theme/IDR_PROFILE_AVATAR_";
 const char kGAIAPictureFileName[] = "Google Profile Picture.png";
@@ skipping 248 matching lines @@
     if (sorted_keys_[i] == search_key)
       return i;
   }
   return std::string::npos;
 }
 
 base::string16 ProfileInfoCache::GetNameOfProfileAtIndex(size_t index) const {
   base::string16 name;
   // Unless the user has customized the profile name, we should use the
   // profile's Gaia given name, if it's available.
-  if (IsUsingGAIANameOfProfileAtIndex(index) &&
-      ProfileIsUsingDefaultNameAtIndex(index)) {
+  if (ProfileIsUsingDefaultNameAtIndex(index)) {
     base::string16 given_name = GetGAIAGivenNameOfProfileAtIndex(index);
     name = given_name.empty() ? GetGAIANameOfProfileAtIndex(index) : given_name;
   }
   if (name.empty())
     GetInfoForProfileAtIndex(index)->GetString(kNameKey, &name);
   return name;
 }
 
 base::string16 ProfileInfoCache::GetShortcutNameOfProfileAtIndex(size_t index)
     const {
@@ skipping 60 matching lines @@
   return name;
 }
 
 base::string16 ProfileInfoCache::GetGAIAGivenNameOfProfileAtIndex(
     size_t index) const {
   base::string16 name;
   GetInfoForProfileAtIndex(index)->GetString(kGAIAGivenNameKey, &name);
   return name;
 }
 
-bool ProfileInfoCache::IsUsingGAIANameOfProfileAtIndex(size_t index) const {
-  bool value = false;
-  GetInfoForProfileAtIndex(index)->GetBoolean(kUseGAIANameKey, &value);
-  return value;
-}
-
 const gfx::Image* ProfileInfoCache::GetGAIAPictureOfProfileAtIndex(
     size_t index) const {
   base::FilePath path = GetPathOfProfileAtIndex(index);
   std::string key = CacheKeyFromProfilePath(path);
 
   // If the picture is already loaded then use it.
   if (gaia_pictures_.count(key)) {
     if (gaia_pictures_[key]->IsEmpty())
       return NULL;
     return gaia_pictures_[key];
@@ skipping 251 matching lines @@
   if (name == GetGAIAGivenNameOfProfileAtIndex(index))
     return;
 
   scoped_ptr<base::DictionaryValue> info(
       GetInfoForProfileAtIndex(index)->DeepCopy());
   info->SetString(kGAIAGivenNameKey, name);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 }
 
-void ProfileInfoCache::SetIsUsingGAIANameOfProfileAtIndex(size_t index,
-                                                          bool value) {
-  if (value == IsUsingGAIANameOfProfileAtIndex(index))
-    return;
-
-  base::string16 old_display_name = GetNameOfProfileAtIndex(index);
-  scoped_ptr<base::DictionaryValue> info(
-      GetInfoForProfileAtIndex(index)->DeepCopy());
-  info->SetBoolean(kUseGAIANameKey, value);
-  // This takes ownership of |info|.
-  SetInfoForProfileAtIndex(index, info.release());
-  base::string16 new_display_name = GetNameOfProfileAtIndex(index);
-  base::FilePath profile_path = GetPathOfProfileAtIndex(index);
-  UpdateSortForProfileIndex(index);
-
-  if (old_display_name != new_display_name) {
-    FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                      observer_list_,
-                      OnProfileNameChanged(profile_path, old_display_name));
-  }
-}
-
 void ProfileInfoCache::SetGAIAPictureOfProfileAtIndex(size_t index,
                                                       const gfx::Image* image) {
   base::FilePath path = GetPathOfProfileAtIndex(index);
   std::string key = CacheKeyFromProfilePath(path);
 
   // Delete the old bitmap from cache.
   std::map<std::string, gfx::Image*>::iterator it = gaia_pictures_.find(key);
   if (it != gaia_pictures_.end()) {
     delete it->second;
     gaia_pictures_.erase(it);
@@ skipping 120 matching lines @@
       if (GetNameOfProfileAtIndex(i) == name) {
         name_found = true;
         break;
       }
     }
     if (!name_found)
       return name;
   }
 }
 
-bool ProfileInfoCache::GetHasMigratedToGAIAInfoOfProfileAtIndex(
-      size_t index) const {
-  bool value = false;
-  GetInfoForProfileAtIndex(index)->GetBoolean(
-      kHasMigratedToGAIAInfoKey, &value);
-  return value;
-}
-
-void ProfileInfoCache::SetHasMigratedToGAIAInfoOfProfileAtIndex(
-    size_t index, bool value) {
-  scoped_ptr<base::DictionaryValue> info(
-      GetInfoForProfileAtIndex(index)->DeepCopy());
-  info->SetBoolean(kHasMigratedToGAIAInfoKey, value);
-  // This takes ownership of |info|.
-  SetInfoForProfileAtIndex(index, info.release());
-}
-
 bool ProfileInfoCache::IconIndexIsUnique(size_t icon_index) const {
   for (size_t i = 0; i < GetNumberOfProfiles(); ++i) {
     if (GetAvatarIconIndexOfProfileAtIndex(i) == icon_index)
       return false;
   }
   return true;
 }
 
 bool ProfileInfoCache::ChooseAvatarIconIndexForNewProfile(
     bool allow_generic_icon,
@@ skipping 167 matching lines @@
     info->GetString(kNameKey, &name);
     names.push_back(name);
   }
   return names;
 }
 
 // static
 void ProfileInfoCache::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kProfileInfoCache);
 }