Resume encryption migration immediately if the previous migration is incomplete.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 599 matching lines @@
 
 void ExistingUserController::ShowKioskEnableScreen() {
   host_->StartWizard(OobeScreen::SCREEN_KIOSK_ENABLE);
 }
 
 void ExistingUserController::ShowKioskAutolaunchScreen() {
   host_->StartWizard(OobeScreen::SCREEN_KIOSK_AUTOLAUNCH);
 }
 
 void ExistingUserController::ShowEncryptionMigrationScreen(
-    const UserContext& user_context) {
+    const UserContext& user_context,
+    bool has_incomplete_migration) {
   host_->StartWizard(OobeScreen::SCREEN_ENCRYPTION_MIGRATION);
 
   EncryptionMigrationScreen* migration_screen =
       static_cast<EncryptionMigrationScreen*>(
           host_->GetWizardController()->current_screen());
   DCHECK(migration_screen);
   migration_screen->SetUserContext(user_context);
+  migration_screen->SetShouldResume(has_incomplete_migration);
   migration_screen->SetContinueLoginCallback(base::BindOnce(
       &ExistingUserController::ContinuePerformLogin, weak_factory_.GetWeakPtr(),
       login_performer_->auth_mode()));
 }
 
 void ExistingUserController::ShowTPMError() {
   login_display_->SetUIEnabled(false);
   login_display_->ShowErrorScreen(LoginDisplay::TPM_ERROR);
 }
 
@@ skipping 223 matching lines @@
           base::Bind(&ExistingUserController::OnTokenHandleChecked,
                      weak_factory_.GetWeakPtr()));
       return;
     }
   }
 
   ShowPasswordChangedDialog();
 }
 
 void ExistingUserController::OnOldEncryptionDetected(
-    const UserContext& user_context) {
-  ShowEncryptionMigrationScreen(user_context);
+    const UserContext& user_context,
+    bool has_incomplete_migration) {
+  ShowEncryptionMigrationScreen(user_context, has_incomplete_migration);
 }
 
 void ExistingUserController::WhiteListCheckFailed(const std::string& email) {
   PerformLoginFinishedActions(true /* start auto login timer */);
 
   login_display_->ShowWhitelistCheckFailedError();
 
   if (auth_status_consumer_) {
     auth_status_consumer_->OnAuthFailure(
         AuthFailure(AuthFailure::WHITELIST_CHECK_FAILED));
@@ skipping 548 matching lines @@
   login_display_->ShowUnrecoverableCrypthomeErrorDialog();
 }
 
 void ExistingUserController::ClearRecordedNames() {
   display_email_.clear();
   display_name_.clear();
   given_name_.clear();
 }
 
 }  // namespace chromeos