Rename UserInfo method GetEmail to GetDisplayEmail.

components/user_manager/user_names.h

 // Copyright 2014 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 CHROMEOS_LOGIN_USER_NAMES_H_
 #define CHROMEOS_LOGIN_USER_NAMES_H_
 
 #include <string>
 
 #include "components/user_manager/user_manager_export.h"
 
 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
 // address.
 // Username for Guest session user.
 USER_MANAGER_EXPORT extern const char kGuestUserName[];
 
 // Domain that is used for all supervised users.
 USER_MANAGER_EXPORT extern const char kSupervisedUserDomain[];
 
 // Canonicalizes a GAIA user ID, accounting for the legacy guest mode user ID
 // which does trips up gaia::CanonicalizeEmail() because it does not contain an
 // @ 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();
 
 USER_MANAGER_EXPORT const AccountId& GuestAccountId();
 
 USER_MANAGER_EXPORT const AccountId& DemoAccountId();
+#endif
 
 }  // namespace user_manager
 
 #endif  // CHROMEOS_LOGIN_USER_NAMES_H_