chromeos: Remove CryptohomeLibrary::TpmGetPassword and TpmIsReady

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 133 matching lines @@
   // CryptohomeClient override.
   virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeAsyncMountGuest);
     proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
                        base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,
                                   weak_ptr_factory_.GetWeakPtr(),
                                   callback));
   }
 
   // CryptohomeClient override.
-  virtual bool TpmIsReady(bool* ready) OVERRIDE {
+  virtual void TpmIsReady(const BoolMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsReady);
-    return CallBoolMethodAndBlock(&method_call, ready);
+    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                       base::Bind(
+                           &CryptohomeClientImpl::OnBoolMethod,
+                           weak_ptr_factory_.GetWeakPtr(),
+                           callback));
   }
 
   // CryptohomeClient override.
   virtual void TpmIsEnabled(const BoolMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsEnabled);
-    proxy_->CallMethod(
-        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(
-            &CryptohomeClientImpl::OnBoolMethod,
-            weak_ptr_factory_.GetWeakPtr(),
-            callback));
+    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                       base::Bind(
+                           &CryptohomeClientImpl::OnBoolMethod,
+                           weak_ptr_factory_.GetWeakPtr(),
+                           callback));
   }
 
   // CryptohomeClient override.
   // TODO(hashimoto): Remove this method. crosbug.com/28500
   virtual bool CallTpmIsEnabledAndBlock(bool* enabled) OVERRIDE {
     // We don't use INITIALIZE_METHOD_CALL here because the C++ method name is
     // different from the D-Bus method name (TpmIsEnabled).
     dbus::MethodCall method_call(cryptohome::kCryptohomeInterface,
                                  cryptohome::kCryptohomeTpmIsEnabled);
     return CallBoolMethodAndBlock(&method_call, enabled);
   }
 
   // CryptohomeClient override.
-  virtual bool TpmGetPassword(std::string* password) OVERRIDE {
+  virtual void TpmGetPassword(const StringMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmGetPassword);
-    scoped_ptr<dbus::Response> response(
-        blocking_method_caller_.CallMethodAndBlock(&method_call));
-    if (!response.get())
-      return false;
-    dbus::MessageReader reader(response.get());
-    return reader.PopString(password);
+    proxy_->CallMethod(
+        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+        base::Bind(&CryptohomeClientImpl::OnStringMethod,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   callback));
   }
 
   // CryptohomeClient override.
   virtual bool TpmIsOwned(bool* owned) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsOwned);
     return CallBoolMethodAndBlock(&method_call, owned);
   }
 
   // CryptohomeClient override.
   virtual bool TpmIsBeingOwned(bool* owning) OVERRIDE {
@@ skipping 143 matching lines @@
     }
     dbus::MessageReader reader(response);
     bool result = false;
     if (!reader.PopBool(&result)) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, false);
       return;
     }
     callback.Run(DBUS_METHOD_CALL_SUCCESS, result);
   }
 
+  // Handles responses for methods with a string value result.
+  void OnStringMethod(const StringMethodCallback& callback,
+                      dbus::Response* response) {
+    if (!response) {
+      callback.Run(DBUS_METHOD_CALL_FAILURE, std::string());
+      return;
+    }
+    dbus::MessageReader reader(response);
+    std::string result;
+    if (!reader.PopString(&result)) {
+      callback.Run(DBUS_METHOD_CALL_FAILURE, std::string());
+      return;
+    }
+    callback.Run(DBUS_METHOD_CALL_SUCCESS, result);
+  }
+
   // Handles responses for Pkcs11GetTpmtTokenInfo.
   void OnPkcs11GetTpmTokenInfo(const Pkcs11GetTpmTokenInfoCallback& callback,
                                dbus::Response* response) {
     if (!response) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, std::string(), std::string());
       return;
     }
     dbus::MessageReader reader(response);
     std::string label;
     std::string user_pin;
@@ skipping 107 matching lines @@
                           const AsyncMethodCallback& callback) OVERRIDE {
     ReturnAsyncMethodResult(callback);
   }
 
   // CryptohomeClient override.
   virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE {
     ReturnAsyncMethodResult(callback);
   }
 
   // CryptohomeClient override.
-  virtual bool TpmIsReady(bool* ready) OVERRIDE {
-    *ready = (tpm_is_ready_counter_++ > 20);
-    return true;
+  virtual void TpmIsReady(const BoolMethodCallback& callback) OVERRIDE {
+    MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
   // CryptohomeClient override.
   virtual void TpmIsEnabled(const BoolMethodCallback& callback) OVERRIDE {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
   // CryptohomeClient override.
   virtual bool CallTpmIsEnabledAndBlock(bool* enabled) OVERRIDE {
     *enabled = true;
     return true;
   }
 
   // CryptohomeClient override.
-  virtual bool TpmGetPassword(std::string* password) OVERRIDE {
+  virtual void TpmGetPassword(const StringMethodCallback& callback) OVERRIDE {
     const char kStubTpmPassword[] = "Stub-TPM-password";
-    *password = kStubTpmPassword;
-    return true;
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, kStubTpmPassword));
   }
 
   // CryptohomeClient override.
   virtual bool TpmIsOwned(bool* owned) OVERRIDE {
     *owned = true;
     return true;
   }
 
   // CryptohomeClient override.
   virtual bool TpmIsBeingOwned(bool* owning) OVERRIDE {
@@ skipping 119 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