Reland of This CL replaces e-mail with AccountId on user selection screen.

components/user_manager/user_info_impl.cc

Index: components/user_manager/user_info_impl.cc
diff --git a/components/user_manager/user_info_impl.cc b/components/user_manager/user_info_impl.cc
index cf6d2ad3306b39b55ae0e96027597ceebb3a5e34..afb2e9de73d99042f9abe60cd01ba01e9848fd2e 100644
--- a/components/user_manager/user_info_impl.cc
+++ b/components/user_manager/user_info_impl.cc
@@ -10,8 +10,8 @@
 
 namespace user_manager {
 
-UserInfoImpl::UserInfoImpl() {
-}
+UserInfoImpl::UserInfoImpl()
+    : account_id_(AccountId::FromUserEmail("stub-user@domain.com")) {}
 
 UserInfoImpl::~UserInfoImpl() {
 }
@@ -25,11 +25,11 @@
 }
 
 std::string UserInfoImpl::GetEmail() const {
-  return "stub-user@domain.com";
+  return account_id_.GetUserEmail();
 }
 
-AccountId UserInfoImpl::GetAccountId() const {
-  return AccountId::FromUserEmail(GetEmail());
+const AccountId& UserInfoImpl::GetAccountId() const {
+  return account_id_;
 }
 
 const gfx::ImageSkia& UserInfoImpl::GetImage() const {