| Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| index fd4df223203ab9d84fb3d3127f586c1d46565b7a..e313b8197d6aa448416a6ab3948e5eb0e2621587 100644
|
| --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
|
| @@ -736,7 +736,7 @@ void ChromeUserManagerImpl::SupervisedUserLoggedIn(
|
|
|
| bool ChromeUserManagerImpl::HasPendingBootstrap(
|
| const AccountId& account_id) const {
|
| - return bootstrap_manager_->HasPendingBootstrap(account_id.GetUserEmail());
|
| + return bootstrap_manager_->HasPendingBootstrap(account_id);
|
| }
|
|
|
| void ChromeUserManagerImpl::PublicAccountUserLoggedIn(
|
| @@ -864,7 +864,7 @@ void ChromeUserManagerImpl::RemoveNonCryptohomeData(
|
|
|
| multi_profile_user_controller_->RemoveCachedValues(account_id.GetUserEmail());
|
|
|
| - EasyUnlockService::ResetLocalStateForUser(account_id.GetUserEmail());
|
| + EasyUnlockService::ResetLocalStateForUser(account_id);
|
| }
|
|
|
| void
|
| @@ -1094,8 +1094,7 @@ void ChromeUserManagerImpl::OnUserNotAllowed(const std::string& user_email) {
|
| }
|
|
|
| void ChromeUserManagerImpl::RemovePendingBootstrapUser(
|
| - const std::string& user_id) {
|
| - const AccountId account_id(AccountId::FromUserEmail(user_id));
|
| + const AccountId& account_id) {
|
| DCHECK(HasPendingBootstrap(account_id));
|
| RemoveNonOwnerUserInternal(account_id, nullptr);
|
| }
|
|
|