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

chromeos/cryptohome/async_method_caller.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 "chromeos/cryptohome/async_method_caller.h"
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 290 matching lines @@
                                const std::string& return_data) {
     const DataCallbackMap::iterator it = data_callback_map_.find(async_id);
     if (it == data_callback_map_.end()) {
       LOG(ERROR) << "Received signal for unknown async_id " << async_id;
       return;
     }
     it->second.proxy->PostTask(FROM_HERE,
         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;
     }
     VLOG(1) << "Adding handler for " << async_id;
     DCHECK_EQ(callback_map_.count(async_id), 0U);
     DCHECK_EQ(data_callback_map_.count(async_id), 0U);
     callback_map_[async_id] = CallbackElement(callback);
   }
 
   // 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;
     }
     VLOG(1) << "Adding handler for " << async_id;
     DCHECK_EQ(callback_map_.count(async_id), 0U);
     DCHECK_EQ(data_callback_map_.count(async_id), 0U);
     data_callback_map_[async_id] = DataCallbackElement(callback);
   }
 
@@ skipping 37 matching lines @@
   g_async_method_caller = NULL;
   VLOG(1) << "AsyncMethodCaller Shutdown completed";
 }
 
 // static
 AsyncMethodCaller* AsyncMethodCaller::GetInstance() {
   return g_async_method_caller;
 }
 
 }  // namespace cryptohome