Resume encryption migration immediately if the previous migration is incomplete.

chromeos/login/auth/cryptohome_authenticator.h

 // 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.
 
 #ifndef CHROMEOS_LOGIN_AUTH_CRYPTOHOME_AUTHENTICATOR_H_
 #define CHROMEOS_LOGIN_AUTH_CRYPTOHOME_AUTHENTICATOR_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 74 matching lines @@
     PUBLIC_ACCOUNT_LOGIN = 17,        // Logged into a public account.
     SUPERVISED_USER_LOGIN = 18,       // Logged in as a supervised user.
     LOGIN_FAILED = 19,                // Login denied.
     OWNER_REQUIRED = 20,              // Login is restricted to the owner only.
     FAILED_USERNAME_HASH = 21,        // Failed GetSanitizedUsername request.
     KIOSK_ACCOUNT_LOGIN = 22,         // Logged into a kiosk account.
     REMOVED_DATA_AFTER_FAILURE = 23,  // Successfully removed the user's
                                       // cryptohome after a login failure.
     FAILED_OLD_ENCRYPTION = 24,       // Login failed, cryptohome is encrypted
                                       // in old format.
+    FAILED_PREVIOUS_MIGRATION_INCOMPLETE = 25,  // Login failed, cryptohome is
+                                                // partially encrypted in old
+                                                // format.
   };
 
   CryptohomeAuthenticator(scoped_refptr<base::TaskRunner> task_runner,
                           AuthStatusConsumer* consumer);
 
   // Authenticator overrides.
   void CompleteLogin(content::BrowserContext* context,
                      const UserContext& user_context) override;
 
   // Given |user_context|, this method attempts to authenticate to your
@@ skipping 53 matching lines @@
   // Attempts to make a decision and call back |consumer_| based on
   // the state we have gathered at the time of call.  If a decision
   // can't be made, defers until the next time this is called.
   // When a decision is made, will call back to |consumer_| on the UI thread.
   //
   // Must be called on the UI thread.
   void Resolve() override;
 
   void OnOffTheRecordAuthSuccess();
   void OnPasswordChangeDetected();
-  void OnOldEncryptionDetected();
+  void OnOldEncryptionDetected(bool has_incomplete_migration);
 
  protected:
   ~CryptohomeAuthenticator() override;
 
   typedef base::Callback<void(bool is_owner)> IsOwnerCallback;
 
   // Method to be implemented in child. Return |true| if user specified in
   // |context| exists on device.
   virtual bool IsKnownUser(const UserContext& context) = 0;
 
@@ skipping 92 matching lines @@
   // When |remove_user_data_on_failure_| is set, we delay calling
   // consumer_->OnAuthFailure() until we removed the user cryptohome.
   const AuthFailure* delayed_login_failure_;
 
   DISALLOW_COPY_AND_ASSIGN(CryptohomeAuthenticator);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_LOGIN_AUTH_CRYPTOHOME_AUTHENTICATOR_H_