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..371453d8f8a0a871f70b67ce70ede31598488d92 100644
--- a/chromeos/login/auth/stub_authenticator.cc
+++ b/chromeos/login/auth/stub_authenticator.cc
@@ -38,7 +38,7 @@ void StubAuthenticator::AuthenticateToLogin(content::BrowserContext* context,
   authentication_context_ = context;
   // Don't compare the entire |expected_user_context_| to |user_context| because
   // during non-online re-auth |user_context| does not have a gaia id.
-  if (expected_user_context_.GetUserID() == user_context.GetUserID() &&
+  if (expected_user_context_.GetAccountId() == user_context.GetAccountId() &&
       *expected_user_context_.GetKey() == *user_context.GetKey()) {
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(&StubAuthenticator::OnAuthSuccess, this));
@@ -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.GetAccountId().GetUserEmail() +
+                                 kUserIdHashSuffix);
   consumer_->OnAuthSuccess(new_user_context);
 }
 
@@ -68,17 +69,18 @@ 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.GetAccountId().GetUserEmail() + kUserIdHashSuffix);
   consumer_->OnAuthSuccess(logged_in_user_context);
 }
 
-void StubAuthenticator::LoginAsKioskAccount(const std::string& app_user_id,
-                                            bool use_guest_mount) {
-  UserContext user_context(expected_user_context_.GetUserID());
+void StubAuthenticator::LoginAsKioskAccount(
+    const std::string& /* app_user_id */,
+    bool use_guest_mount) {
+  UserContext user_context(expected_user_context_.GetAccountId());
   user_context.SetIsUsingOAuth(false);
-  user_context.SetUserIDHash(expected_user_context_.GetUserID() +
-                             kUserIdHashSuffix);
+  user_context.SetUserIDHash(
+      expected_user_context_.GetAccountId().GetUserEmail() + kUserIdHashSuffix);
   consumer_->OnAuthSuccess(user_context);
 }
 
@@ -86,8 +88,8 @@ 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() +
-                             kUserIdHashSuffix);
+  user_context.SetUserIDHash(
+      expected_user_context_.GetAccountId().GetUserEmail() + kUserIdHashSuffix);
   consumer_->OnAuthSuccess(user_context);
 }