Convert chromeos::CryptohomeClient::TpmCanAttemptOwnership to asynchronous

chromeos/dbus/cryptohome_client.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/dbus/cryptohome_client.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chromeos/dbus/blocking_method_caller.h"
 #include "dbus/bus.h"
@@ skipping 177 matching lines @@
     return CallBoolMethodAndBlock(&method_call, owned);
   }
 
   // CryptohomeClient override.
   virtual bool TpmIsBeingOwned(bool* owning) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsBeingOwned);
     return CallBoolMethodAndBlock(&method_call, owning);
   }
 
   // CryptohomeClient override.
-  virtual bool TpmCanAttemptOwnership() OVERRIDE {
+  virtual void TpmCanAttemptOwnership(
+      const VoidMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call,
                            cryptohome::kCryptohomeTpmCanAttemptOwnership);
-    scoped_ptr<dbus::Response> response(
-        blocking_method_caller_.CallMethodAndBlock(&method_call));
-    return response.get() != NULL;
+    CallVoidMethod(&method_call, callback);
   }
 
   // CryptohomeClient override.
   virtual bool TpmClearStoredPassword() OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call,
                            cryptohome::kCryptohomeTpmClearStoredPassword);
     scoped_ptr<dbus::Response> response(
         blocking_method_caller_.CallMethodAndBlock(&method_call));
     return response.get() != NULL;
   }
@@ skipping 90 matching lines @@
       return;
     dbus::MessageReader reader(response);
     int async_id = 0;
     if (!reader.PopInt32(&async_id)) {
       LOG(ERROR) << "Invalid response: " << response->ToString();
       return;
     }
     callback.Run(async_id);
   }
 
+  // Calls a method without result values.
+  void CallVoidMethod(dbus::MethodCall* method_call,
+                      const VoidMethodCallback& callback) {
+    proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                       base::Bind(&CryptohomeClientImpl::OnVoidMethod,
+                                  weak_ptr_factory_.GetWeakPtr(),
+                                  callback));
+  }
+
+  void OnVoidMethod(const VoidMethodCallback& callback,
+                    dbus::Response* response) {
+    if (!response) {
+      callback.Run(DBUS_METHOD_CALL_FAILURE);
+      return;
+    }
+    callback.Run(DBUS_METHOD_CALL_SUCCESS);
+  }
+
   // Calls a method with a bool value reult and block.
   bool CallBoolMethodAndBlock(dbus::MethodCall* method_call,
                               bool* result) {
     scoped_ptr<dbus::Response> response(
         blocking_method_caller_.CallMethodAndBlock(method_call));
     if (!response.get())
       return false;
     dbus::MessageReader reader(response.get());
     return reader.PopBool(result);
   }
@@ skipping 198 matching lines @@
     return true;
   }
 
   // CryptohomeClient override.
   virtual bool TpmIsBeingOwned(bool* owning) OVERRIDE {
     *owning = true;
     return true;
   }
 
   // CryptohomeClient override.
-  virtual bool TpmCanAttemptOwnership() OVERRIDE { return true; }
+  virtual void TpmCanAttemptOwnership(
+      const VoidMethodCallback& callback) OVERRIDE {
+    MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
+  }
 
   // CryptohomeClient override.
   virtual bool TpmClearStoredPassword() OVERRIDE { return true; }
 
   // CryptohomeClient override.
   virtual void Pkcs11IsTpmTokenReady(
       const BoolMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
@@ skipping 103 matching lines @@
 // static
 CryptohomeClient* CryptohomeClient::Create(DBusClientImplementationType type,
                                            dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new CryptohomeClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new CryptohomeClientStubImpl();
 }
 
 }  // namespace chromeos