| Index: chrome/browser/chromeos/login/existing_user_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| index 2e2bb5aa35d0a6850f83dcabe1c3301addc9223f..6738f8abd490c93d3cac78deae5fed0fa98745f6 100644
|
| --- a/chrome/browser/chromeos/login/existing_user_controller.cc
|
| +++ b/chrome/browser/chromeos/login/existing_user_controller.cc
|
| @@ -560,7 +560,7 @@ void ExistingUserController::OnPasswordChangeDetected(
|
| const GaiaAuthConsumer::ClientLoginResult& credentials) {
|
| // When signing in as a "New user" always remove old cryptohome.
|
| if (selected_view_index_ == controllers_.size() - 1) {
|
| - login_performer_->ResyncEncryptedData();
|
| + ResyncEncryptedData();
|
| return;
|
| }
|
|
|
| @@ -618,11 +618,15 @@ void ExistingUserController::OnCaptchaEntered(const std::string& captcha) {
|
|
|
| void ExistingUserController::RecoverEncryptedData(
|
| const std::string& old_password) {
|
| - login_performer_->RecoverEncryptedData(old_password);
|
| + // LoginPerformer instance has state of the user so it should exist.
|
| + if (login_performer_.get())
|
| + login_performer_->RecoverEncryptedData(old_password);
|
| }
|
|
|
| void ExistingUserController::ResyncEncryptedData() {
|
| - login_performer_->ResyncEncryptedData();
|
| + // LoginPerformer instance has state of the user so it should exist.
|
| + if (login_performer_.get())
|
| + login_performer_->ResyncEncryptedData();
|
| }
|
|
|
| } // namespace chromeos
|
|
|