Rename UserInfo method GetEmail to GetDisplayEmail.

components/user_manager/user_names.cc

 // 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.
 #include "components/user_manager/user_names.h"
 
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
@@ skipping 36 matching lines @@
 FixedAccountManager::FixedAccountManager()
     : stub_account_id_(AccountId::FromUserEmail(user_manager::kStubUser)),
       signin_account_id_(AccountId::FromUserEmail(kSignInUser)),
       guest_account_id_(AccountId::FromUserEmail(user_manager::kGuestUserName)),
       demo_account_id_(AccountId::FromUserEmail(kDemoUserName)) {}
 
 }  // namespace
 
 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)
     return 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();
 }
 
 const AccountId& GuestAccountId() {
   return FixedAccountManager::GetInstance()->guest_account_id();
 }
 
 const AccountId& DemoAccountId() {
   return FixedAccountManager::GetInstance()->demo_account_id();
 }
 
 }  // namespace user_manager