Rename UserInfo method GetEmail to GetDisplayEmail.

components/user_manager/user_names.cc

Index: components/user_manager/user_names.cc
diff --git a/components/user_manager/user_names.cc b/components/user_manager/user_names.cc
index a7cd67b16ffc565d2db87e5cb77006a6a8834576..bb993b721bd1db0dc38d38e9bc1d03969ca8a5dc 100644
--- a/components/user_manager/user_names.cc
+++ b/components/user_manager/user_names.cc
@@ -54,12 +54,17 @@ FixedAccountManager::FixedAccountManager()
 
 namespace user_manager {
 
-constexpr const char kStubUser[] = "stub-user@example.com";
+const char kStubUser[] = "stub-user@example.com";
 
 // Should match cros constant in platform/libchromeos/chromeos/cryptohome.h
-constexpr const char kGuestUserName[] = "$guest";
+const char kGuestUserName[] = "$guest";
 
-constexpr const char kSupervisedUserDomain[] = "locally-managed.localhost";
+const char kSupervisedUserDomain[] = "locally-managed.localhost";
+
+// StubAccountId is used for all tests, not only ChromeOS
+const AccountId& StubAccountId() {

[xiyuan, 2016/10/28 16:40:59]

nit: move this back to before "SigninAccountId()" or update header to make the
order in h and cc match.

[Alexander Alekseev, 2016/10/31 21:31:01]

Done.

+  return FixedAccountManager::GetInstance()->stub_account_id();
+}
 
 std::string CanonicalizeUserID(const std::string& user_id) {
   if (user_id == kGuestUserName)
@@ -67,10 +72,6 @@ std::string CanonicalizeUserID(const std::string& user_id) {
   return gaia::CanonicalizeEmail(user_id);
 }
 
-const AccountId& StubAccountId() {
-  return FixedAccountManager::GetInstance()->stub_account_id();
-}
-
 const AccountId& SignInAccountId() {
   return FixedAccountManager::GetInstance()->signin_account_id();
 }