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

chrome/browser/profiles/profile_info_cache.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 59 matching lines @@
       size_t index) const OVERRIDE;
   // Note that a return value of false could mean an error in collection or
   // that there are currently no background apps running. However, the action
   // which results is the same in both cases (thus far).
   virtual bool GetBackgroundStatusOfProfileAtIndex(
       size_t index) const OVERRIDE;
   virtual base::string16 GetGAIANameOfProfileAtIndex(
       size_t index) const OVERRIDE;
   virtual base::string16 GetGAIAGivenNameOfProfileAtIndex(
       size_t index) const OVERRIDE;
-  virtual bool IsUsingGAIANameOfProfileAtIndex(size_t index) const OVERRIDE;
   // Returns the GAIA picture for the given profile. This may return NULL
   // if the profile does not have a GAIA picture or if the picture must be
   // loaded from disk.
   virtual const gfx::Image* GetGAIAPictureOfProfileAtIndex(
       size_t index) const OVERRIDE;
   virtual bool IsUsingGAIAPictureOfProfileAtIndex(
       size_t index) const OVERRIDE;
   virtual bool ProfileIsManagedAtIndex(size_t index) const OVERRIDE;
   virtual bool IsOmittedProfileAtIndex(size_t index) const OVERRIDE;
   virtual bool ProfileIsSigninRequiredAtIndex(size_t index) const OVERRIDE;
@@ skipping 13 matching lines @@
   void SetAvatarIconOfProfileAtIndex(size_t index, size_t icon_index);
   void SetIsOmittedProfileAtIndex(size_t index, bool is_omitted);
   void SetManagedUserIdOfProfileAtIndex(size_t index, const std::string& id);
   void SetLocalAuthCredentialsOfProfileAtIndex(size_t index,
                                                const std::string& auth);
   void SetBackgroundStatusOfProfileAtIndex(size_t index,
                                            bool running_background_apps);
   void SetGAIANameOfProfileAtIndex(size_t index, const base::string16& name);
   void SetGAIAGivenNameOfProfileAtIndex(size_t index,
                                         const base::string16& name);
-  void SetIsUsingGAIANameOfProfileAtIndex(size_t index, bool value);
   void SetGAIAPictureOfProfileAtIndex(size_t index, const gfx::Image* image);
   void SetIsUsingGAIAPictureOfProfileAtIndex(size_t index, bool value);
   void SetProfileSigninRequiredAtIndex(size_t index, bool value);
   void SetProfileIsEphemeralAtIndex(size_t index, bool value);
   void SetProfileIsUsingDefaultNameAtIndex(size_t index, bool value);
 
   // Returns unique name that can be assigned to a newly created profile.
   base::string16 ChooseNameForNewProfile(size_t icon_index) const;
 
-  // Checks if the given profile has switched to using GAIA information
-  // for the profile name and picture. This pref is used to switch over
-  // to GAIA info the first time it is available. Afterwards this pref is
-  // checked to prevent clobbering the user's custom settings.
-  bool GetHasMigratedToGAIAInfoOfProfileAtIndex(size_t index) const;
-
-  // Marks the given profile as having switched to using GAIA information
-  // for the profile name and picture.
-  void SetHasMigratedToGAIAInfoOfProfileAtIndex(size_t index, bool value);
-
   // Returns an avatar icon index that can be assigned to a newly created
   // profile. Note that the icon may not be unique since there are a limited
   // set of default icons.
   size_t ChooseAvatarIconIndexForNewProfile() const;
 
   const base::FilePath& GetUserDataDir() const;
 
   // Gets the number of default avatar icons that exist.
   static size_t GetDefaultAvatarIconCount();
   // Gets the resource ID of the default avatar icon at |index|.
@@ skipping 59 matching lines @@
   // to be mutable.
   mutable std::map<std::string, gfx::Image*> gaia_pictures_;
   // Marks a gaia profile picture as loading. This prevents a picture from
   // loading multiple times.
   mutable std::map<std::string, bool> gaia_pictures_loading_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileInfoCache);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_INFO_CACHE_H_