cryptohome: Make CryptohomeClient::Unmount non-blocking

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 711 matching lines @@
   return false;
 }
 
 void CryptohomeAuthenticator::OnOwnershipChecked(bool is_owner) {
   // Now we can check if this user is the owner.
   user_can_login_ = is_owner;
   owner_is_verified_ = true;
   Resolve();
 }
 
+void CryptohomeAuthenticator::OnUnmount(DBusMethodCallStatus call_status,
+                                        bool success) {
+  if (call_status != DBUS_METHOD_CALL_SUCCESS || !success) {
+    // Maybe we should reboot immediately here?
+    LOGIN_LOG(ERROR) << "Couldn't unmount users home!";
+  }
+  OnAuthFailure(AuthFailure(AuthFailure::OWNER_REQUIRED));
+}
+
 void CryptohomeAuthenticator::Resolve() {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   bool create_if_nonexistent = false;
   CryptohomeAuthenticator::AuthState state = ResolveState();
   VLOG(1) << "Resolved state to: " << state;
   switch (state) {
     case CONTINUE:
     case POSSIBLE_PW_CHANGE:
     case NO_MOUNT:
       // These are intermediate states; we need more info from a request that
@@ skipping 100 matching lines @@
       break;
     case LOGIN_FAILED:
       current_state_->ResetCryptohomeStatus();
       task_runner_->PostTask(FROM_HERE,
                              base::Bind(&CryptohomeAuthenticator::OnAuthFailure,
                                         this,
                                         current_state_->online_outcome()));
       break;
     case OWNER_REQUIRED: {
       current_state_->ResetCryptohomeStatus();
-      bool success = false;
-      DBusThreadManager::Get()->GetCryptohomeClient()->Unmount(&success);
-      if (!success) {
-        // Maybe we should reboot immediately here?
-        LOGIN_LOG(ERROR) << "Couldn't unmount users home!";
-      }
-      task_runner_->PostTask(
-          FROM_HERE,
-          base::Bind(&CryptohomeAuthenticator::OnAuthFailure,
-                     this,
-                     AuthFailure(AuthFailure::OWNER_REQUIRED)));
+      DBusThreadManager::Get()->GetCryptohomeClient()->Unmount(
+          base::Bind(&CryptohomeAuthenticator::OnUnmount, this));
       break;
     }
     case FAILED_OLD_ENCRYPTION:
       // 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));
       break;
@@ skipping 150 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