Resume encryption migration immediately if the previous migration is incomplete.

chromeos/login/auth/cryptohome_authenticator.cc

 // Copyright 2014 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 "chromeos/login/auth/cryptohome_authenticator.h"
 
 #include <stdint.h>
 
 #include <vector>
 
@@ skipping 642 matching lines @@
   if (consumer_)
     consumer_->OnOffTheRecordAuthSuccess();
 }
 
 void CryptohomeAuthenticator::OnPasswordChangeDetected() {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   if (consumer_)
     consumer_->OnPasswordChangeDetected();
 }
 
-void CryptohomeAuthenticator::OnOldEncryptionDetected() {
+void CryptohomeAuthenticator::OnOldEncryptionDetected(
+    bool has_incomplete_migration) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
-  if (consumer_)
-    consumer_->OnOldEncryptionDetected(current_state_->user_context);
+  if (consumer_) {
+    consumer_->OnOldEncryptionDetected(current_state_->user_context,
+                                       has_incomplete_migration);
+  }
 }
 
 void CryptohomeAuthenticator::OnAuthFailure(const AuthFailure& error) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   // OnAuthFailure will be called again with the same |error|
   // after the cryptohome has been removed.
   if (remove_user_data_on_failure_) {
     delayed_login_failure_ = &error;
     RemoveEncryptedData();
@@ skipping 181 matching lines @@
                                         this,
                                         current_state_->online_outcome()));
       break;
     case OWNER_REQUIRED: {
       current_state_->ResetCryptohomeStatus();
       DBusThreadManager::Get()->GetCryptohomeClient()->Unmount(
           base::Bind(&CryptohomeAuthenticator::OnUnmount, this));
       break;
     }
     case FAILED_OLD_ENCRYPTION:
+    case FAILED_PREVIOUS_MIGRATION_INCOMPLETE:
       // In this case, we tried to create/mount cryptohome and failed
       // because the file system is encrypted in old format.
       // Chrome will show a screen which asks user to migrate the encryption.
       task_runner_->PostTask(
           FROM_HERE,
-          base::Bind(&CryptohomeAuthenticator::OnOldEncryptionDetected, this));
+          base::Bind(&CryptohomeAuthenticator::OnOldEncryptionDetected, this,
+                     state == FAILED_PREVIOUS_MIGRATION_INCOMPLETE));
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 CryptohomeAuthenticator::~CryptohomeAuthenticator() {
 }
 
@@ skipping 57 matching lines @@
   if (current_state_->cryptohome_code() ==
       cryptohome::MOUNT_ERROR_TPM_NEEDS_REBOOT) {
     // Critical TPM error detected, reboot needed.
     return FAILED_TPM;
   }
 
   if (current_state_->cryptohome_code() ==
       cryptohome::MOUNT_ERROR_OLD_ENCRYPTION) {
     return FAILED_OLD_ENCRYPTION;
   }
+  if (current_state_->cryptohome_code() ==
+      cryptohome::MOUNT_ERROR_PREVIOUS_MIGRATION_INCOMPLETE) {
+    return FAILED_PREVIOUS_MIGRATION_INCOMPLETE;
+  }
 
   // Return intermediate states in the following case:
   // when there is an online result to use;
   // This is the case after user finishes Gaia login;
   if (current_state_->online_complete()) {
     if (current_state_->cryptohome_code() ==
         cryptohome::MOUNT_ERROR_KEY_FAILURE) {
       // If we tried a mount but they used the wrong key, we may need to
       // ask the user for their old password.  We'll only know once we've
       // done the online check.
@@ skipping 64 matching lines @@
   Resolve();
 }
 
 void CryptohomeAuthenticator::SetOwnerState(bool owner_check_finished,
                                             bool check_result) {
   owner_is_verified_ = owner_check_finished;
   user_can_login_ = check_result;
 }
 
 }  // namespace chromeos