Cryptohome: Notify about error in async calls if cryptohome is not ready yet.

chromeos/cryptohome/async_method_caller.cc

Index: chromeos/cryptohome/async_method_caller.cc
diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc
index 0b137b035fee2fd0e3bbecc45ba1f193ef4da49d..33cba221bfb45da393127b182e0ebdaf47bb73d1 100644
--- a/chromeos/cryptohome/async_method_caller.cc
+++ b/chromeos/cryptohome/async_method_caller.cc
@@ -308,10 +308,17 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
         base::Bind(it->second.data_callback, return_status, return_data));
     data_callback_map_.erase(it);
   }
-
   // Registers a callback which is called when the result for AsyncXXX is ready.
   void RegisterAsyncCallback(
       Callback callback, const char* error, int async_id) {
+    if (async_id == chromeos::kCryptohomeNotReadyAsyncId) {
+      base::MessageLoopProxy::current()->PostTask(
+          FROM_HERE, base::Bind(callback,
+                                false,  // return status
+                                cryptohome::MOUNT_ERROR_FATAL));
+      return;
+    }
+
     if (async_id == 0) {
       LOG(ERROR) << error;
       return;
@@ -325,6 +332,13 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   // Registers a callback which is called when the result for AsyncXXX is ready.
   void RegisterAsyncDataCallback(
       DataCallback callback, const char* error, int async_id) {
+    if (async_id == chromeos::kCryptohomeNotReadyAsyncId) {
+      base::MessageLoopProxy::current()->PostTask(
+          FROM_HERE, base::Bind(callback,
+                                false,  // return status
+                                std::string()));

[Daniel Erat, 2015/01/28 18:01:46]

nit: is there a reason for not using MOUNT_ERROR_FATAL here? is there some other
reason that could be attached rather than an empty string?

[Denis Kuznetsov (DE-MUC), 2015/01/28 19:45:26]

This callback expects std::string() instead of enum, it is used to get part of
mountpoint (actually, hash of username).

+      return;
+    }
     if (async_id == 0) {
       LOG(ERROR) << error;
       return;