Rename UserInfo method GetEmail to GetDisplayEmail.

components/user_manager/user_names.h

Index: components/user_manager/user_names.h
diff --git a/components/user_manager/user_names.h b/components/user_manager/user_names.h
index 2f4e32fa028b35e040588b96b20738fd5973df78..ef92d0f4084570bec7a9eb7b386fa106f147cd28 100644
--- a/components/user_manager/user_names.h
+++ b/components/user_manager/user_names.h
@@ -13,9 +13,13 @@ class AccountId;
 
 namespace user_manager {
 
-// Username for stub login when not running on ChromeOS.
+// Username for stub login for tests only.
+// It is also used for Chrome for ChromeOS linux dev build.
 USER_MANAGER_EXPORT extern const char kStubUser[];
 
+USER_MANAGER_EXPORT const AccountId& StubAccountId();
+
+#if defined(OS_CHROMEOS)

[xiyuan, 2016/10/27 18:25:59]

Why do we need to make it chromeos specific? Can we leave it for all platforms
and let the linker to get rid of the unused code?

[Alexander Alekseev, 2016/10/28 11:10:25]

Done.

 // Magic e-mail addresses are bad. They exist here because some code already
 // depends on them and it is hard to figure out what. Any user types added in
 // the future should be identified by a new |UserType|, not a new magic e-mail
@@ -31,8 +35,6 @@ USER_MANAGER_EXPORT extern const char kSupervisedUserDomain[];
 // @ symbol.
 USER_MANAGER_EXPORT std::string CanonicalizeUserID(const std::string& user_id);
 
-USER_MANAGER_EXPORT const AccountId& StubAccountId();
-
 // AccountId for the login screen. It identifies ephemeral profile that is used
 // to display WebUI during OOBE and SignIn.
 USER_MANAGER_EXPORT const AccountId& SignInAccountId();
@@ -40,6 +42,7 @@ USER_MANAGER_EXPORT const AccountId& SignInAccountId();
 USER_MANAGER_EXPORT const AccountId& GuestAccountId();
 
 USER_MANAGER_EXPORT const AccountId& DemoAccountId();
+#endif
 
 }  // namespace user_manager