This CL replaces user_manager::UserID with AccountId.

chromeos/login/auth/stub_authenticator.cc

Index: chromeos/login/auth/stub_authenticator.cc
diff --git a/chromeos/login/auth/stub_authenticator.cc b/chromeos/login/auth/stub_authenticator.cc
index 6a183a4328a9d1eec814fd2c314ec2090555e3dd..00a8b15d1c4fad1d53d9401dc2db1de8093ed92b 100644
--- a/chromeos/login/auth/stub_authenticator.cc
+++ b/chromeos/login/auth/stub_authenticator.cc
@@ -57,7 +57,8 @@ void StubAuthenticator::AuthenticateToUnlock(const UserContext& user_context) {
 
 void StubAuthenticator::LoginAsSupervisedUser(const UserContext& user_context) {
   UserContext new_user_context = user_context;
-  new_user_context.SetUserIDHash(user_context.GetUserID() + kUserIdHashSuffix);
+  new_user_context.SetUserIDHash(user_context.GetUserID().GetUserEmail() +
+                                 kUserIdHashSuffix);
   consumer_->OnAuthSuccess(new_user_context);
 }
 
@@ -68,8 +69,8 @@ void StubAuthenticator::LoginOffTheRecord() {
 void StubAuthenticator::LoginAsPublicSession(const UserContext& user_context) {
   UserContext logged_in_user_context = user_context;
   logged_in_user_context.SetIsUsingOAuth(false);
-  logged_in_user_context.SetUserIDHash(logged_in_user_context.GetUserID() +
-                                       kUserIdHashSuffix);
+  logged_in_user_context.SetUserIDHash(
+      logged_in_user_context.GetUserID().GetUserEmail() + kUserIdHashSuffix);
   consumer_->OnAuthSuccess(logged_in_user_context);
 }
 
@@ -77,7 +78,7 @@ void StubAuthenticator::LoginAsKioskAccount(const std::string& app_user_id,
                                             bool use_guest_mount) {
   UserContext user_context(expected_user_context_.GetUserID());
   user_context.SetIsUsingOAuth(false);
-  user_context.SetUserIDHash(expected_user_context_.GetUserID() +
+  user_context.SetUserIDHash(expected_user_context_.GetUserID().GetUserEmail() +
                              kUserIdHashSuffix);
   consumer_->OnAuthSuccess(user_context);
 }
@@ -86,7 +87,7 @@ void StubAuthenticator::OnAuthSuccess() {
   // If we want to be more like the real thing, we could save the user ID
   // in AuthenticateToLogin, but there's not much of a point.
   UserContext user_context(expected_user_context_);
-  user_context.SetUserIDHash(expected_user_context_.GetUserID() +
+  user_context.SetUserIDHash(expected_user_context_.GetUserID().GetUserEmail() +
                              kUserIdHashSuffix);
   consumer_->OnAuthSuccess(user_context);
 }