| Index: chromeos/login/auth/cryptohome_authenticator.cc
|
| diff --git a/chromeos/login/auth/cryptohome_authenticator.cc b/chromeos/login/auth/cryptohome_authenticator.cc
|
| index 6b29183a88e9718f5f3b3a71d5ccefffd6508f5c..6b0a8b9d16aaf8f9bb1034939a63b48c51646d80 100644
|
| --- a/chromeos/login/auth/cryptohome_authenticator.cc
|
| +++ b/chromeos/login/auth/cryptohome_authenticator.cc
|
| @@ -25,11 +25,11 @@
|
| #include "chromeos/login/auth/key.h"
|
| #include "chromeos/login/auth/user_context.h"
|
| #include "chromeos/login/login_state.h"
|
| -#include "chromeos/login/user_names.h"
|
| #include "chromeos/login_event_recorder.h"
|
| #include "components/device_event_log/device_event_log.h"
|
| #include "components/signin/core/account_id/account_id.h"
|
| #include "components/user_manager/known_user.h"
|
| +#include "components/user_manager/user_names.h"
|
| #include "components/user_manager/user_type.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| @@ -556,7 +556,8 @@ void CryptohomeAuthenticator::LoginAsSupervisedUser(
|
| void CryptohomeAuthenticator::LoginOffTheRecord() {
|
| DCHECK(task_runner_->RunsTasksOnCurrentThread());
|
| current_state_.reset(new AuthAttemptState(
|
| - UserContext(user_manager::USER_TYPE_GUEST, login::GuestAccountId()),
|
| + UserContext(user_manager::USER_TYPE_GUEST,
|
| + user_manager::chromeos::GuestAccountId()),
|
| false, // unlock
|
| false, // online_complete
|
| false)); // user_is_new
|
| @@ -588,8 +589,9 @@ void CryptohomeAuthenticator::LoginAsKioskAccount(
|
| bool use_guest_mount) {
|
| DCHECK(task_runner_->RunsTasksOnCurrentThread());
|
|
|
| - const AccountId& account_id =
|
| - use_guest_mount ? login::GuestAccountId() : app_account_id;
|
| + const AccountId& account_id = use_guest_mount
|
| + ? user_manager::chromeos::GuestAccountId()
|
| + : app_account_id;
|
| current_state_.reset(new AuthAttemptState(
|
| UserContext(user_manager::USER_TYPE_KIOSK_APP, account_id),
|
| false, // unlock
|
|
|