Add gaia_id to ProfileInfoCache.

chrome/browser/profiles/avatar_menu.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_AVATAR_MENU_H_
 #define CHROME_BROWSER_PROFILES_AVATAR_MENU_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
 
     // The icon to be displayed next to the item.
     gfx::Image icon;
 
     // Whether or not the current browser is using this profile.
     bool active;
 
     // The name of this profile.
     base::string16 name;
 
-    // A string representing the sync state of the profile.
-    base::string16 sync_state;
+    // A string representing the username of the profile, if signed in.  Empty
+    // when not signed in.
+    base::string16 username;
 
     // Whether or not the current profile is signed in. If true, |sync_state| is
     // expected to be the email of the signed in user.
     bool signed_in;
 
     // Whether or not the current profile requires sign-in before use.
     bool signin_required;
 
     // Whether or not the current profile is a legacy supervised user profile
     // (see SupervisedUserService).
@@ skipping 79 matching lines @@
   // Returns true if the edit profile link should be shown.
   bool ShouldShowEditProfileLink() const;
 
  private:
   // ProfileInfoCacheObserver:
   void OnProfileAdded(const base::FilePath& profile_path) override;
   void OnProfileWasRemoved(const base::FilePath& profile_path,
       const base::string16& profile_name) override;
   void OnProfileNameChanged(const base::FilePath& profile_path,
       const base::string16& old_profile_name) override;
-  void OnProfileUserNameChanged(const base::FilePath& profile_path) override;
+  void OnProfileAuthInfoChanged(const base::FilePath& profile_path) override;
   void OnProfileAvatarChanged(const base::FilePath& profile_path) override;
   void OnProfileHighResAvatarLoaded(
       const base::FilePath& profile_path) override;
   void OnProfileSigninRequiredChanged(
       const base::FilePath& profile_path) override;
   void OnProfileIsOmittedChanged(const base::FilePath& profile_path) override;
 
 #if defined(ENABLE_SUPERVISED_USERS)
   // SupervisedUserServiceObserver:
   void OnCustodianInfoChanged() override;
@@ skipping 20 matching lines @@
   // The observer of this model, which is notified of changes. Weak.
   AvatarMenuObserver* observer_;
 
   // Browser in which this avatar menu resides. Weak.
   Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(AvatarMenu);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_AVATAR_MENU_H_