Make sure avatar menu does not use account_id for display purposes.

chrome/browser/signin/signin_ui_util.h

Index: chrome/browser/signin/signin_ui_util.h
diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h
index 68010c92ee6e2fbca9ce129795558555be3cf942..943573801cea8cfaa043424e26a3c56c86530733 100644
--- a/chrome/browser/signin/signin_ui_util.h
+++ b/chrome/browser/signin/signin_ui_util.h
@@ -42,6 +42,12 @@ void InitializePrefsForProfile(Profile* profile);
 // Shows a learn more page for signin errors.
 void ShowSigninErrorLearnMorePage(Profile* profile);
 
+// Returns the display email string for the given account.  If the profile
+// has not been migrated to use gaia ids, then its possible for the display
+// to not ne known yet.  In this case, use |account_id|, which is assumed to
+// be an email address.
+std::string GetDisplayEmail(Profile* profile, const std::string& account_id);
+
 }  // namespace signin_ui_util
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_UI_UTIL_H_