Remove chromeos::CryptohomeLibrary::IsMounted and convert

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 35 matching lines @@
       OVERRIDE {
     async_call_status_handler_ = handler;
   }
 
   // CryptohomeClient override.
   virtual void ResetAsyncCallStatusHandler() OVERRIDE {
     async_call_status_handler_.Reset();
   }
 
   // CryptohomeClient override.
-  virtual bool IsMounted(bool* is_mounted) OVERRIDE {
+  virtual void IsMounted(const BoolMethodCallback& callback) {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeIsMounted);
-    return CallBoolMethodAndBlock(&method_call, is_mounted);
+    CallBoolMethod(&method_call, callback);
   }
 
   // CryptohomeClient override.
   virtual bool Unmount(bool *success) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeUnmount);
     return CallBoolMethodAndBlock(&method_call, success);
   }
 
   // CryptohomeClient override.
   virtual void AsyncCheckKey(const std::string& username,
@@ skipping 77 matching lines @@
     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 void TpmIsReady(const BoolMethodCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsReady);
-    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                       base::Bind(
-                           &CryptohomeClientImpl::OnBoolMethod,
-                           weak_ptr_factory_.GetWeakPtr(),
-                           callback));
+    CallBoolMethod(&method_call, 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));
+    CallBoolMethod(&method_call, 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);
@@ skipping 37 matching lines @@
     scoped_ptr<dbus::Response> response(
         blocking_method_caller_.CallMethodAndBlock(&method_call));
     return response.get() != NULL;
   }
 
   // CryptohomeClient override.
   virtual void Pkcs11IsTpmTokenReady(const BoolMethodCallback& callback)
       OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call,
                            cryptohome::kCryptohomePkcs11IsTpmTokenReady);
-    proxy_->CallMethod(
-        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(
-            &CryptohomeClientImpl::OnBoolMethod,
-            weak_ptr_factory_.GetWeakPtr(),
-            callback));
+    CallBoolMethod(&method_call, callback);
   }
 
   // CryptohomeClient override.
   virtual void Pkcs11GetTpmTokenInfo(
       const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE {
     INITIALIZE_METHOD_CALL(method_call,
                            cryptohome::kCryptohomePkcs11GetTpmTokenInfo);
     proxy_->CallMethod(
         &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(
@@ skipping 84 matching lines @@
   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);
   }
 
+  // Calls a method with a bool value result.
+  void CallBoolMethod(dbus::MethodCall* method_call,
+                      const BoolMethodCallback& callback) {
+    proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
+                       base::Bind(
+                           &CryptohomeClientImpl::OnBoolMethod,
+                           weak_ptr_factory_.GetWeakPtr(),
+                           callback));
+  }
+
   // Handles responses for methods with a bool value result.
   void OnBoolMethod(const BoolMethodCallback& callback,
                     dbus::Response* response) {
     if (!response) {
       callback.Run(DBUS_METHOD_CALL_FAILURE, false);
       return;
     }
     dbus::MessageReader reader(response);
     bool result = false;
     if (!reader.PopBool(&result)) {
@@ skipping 85 matching lines @@
       OVERRIDE {
     async_call_status_handler_ = handler;
   }
 
   // CryptohomeClient override.
   virtual void ResetAsyncCallStatusHandler() OVERRIDE {
     async_call_status_handler_.Reset();
   }
 
   // CryptohomeClient override.
-  virtual bool IsMounted(bool* is_mounted) OVERRIDE {
-    *is_mounted = true;
-    return true;
+  virtual void IsMounted(const BoolMethodCallback& callback) OVERRIDE {
+    MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
   }
 
   // CryptohomeClient override.
   virtual bool Unmount(bool* success) OVERRIDE {
     *success = true;
     return true;
   }
 
   // CryptohomeClient override.
   virtual void AsyncCheckKey(const std::string& username,
@@ skipping 193 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