Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

chrome/browser/chromeos/dbus/cryptohome_client.cc

Index: chrome/browser/chromeos/dbus/cryptohome_client.cc
diff --git a/chrome/browser/chromeos/dbus/cryptohome_client.cc b/chrome/browser/chromeos/dbus/cryptohome_client.cc
deleted file mode 100644
index 57674be01102bed8d19288b1d693944db13a8083..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/dbus/cryptohome_client.cc
+++ /dev/null
@@ -1,638 +0,0 @@
-// 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 "chrome/browser/chromeos/dbus/cryptohome_client.h"
-
-#include "base/bind.h"
-#include "base/message_loop.h"
-#include "chrome/browser/chromeos/dbus/blocking_method_caller.h"
-#include "dbus/bus.h"
-#include "dbus/message.h"
-#include "dbus/object_path.h"
-#include "dbus/object_proxy.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
-
-namespace chromeos {
-
-namespace {
-
-// A convenient macro to initialize a dbus::MethodCall while checking the dbus
-// method name matches to the C++ method name.
-#define INITIALIZE_METHOD_CALL(method_call_name, method_name)         \
-  DCHECK_EQ(std::string(method_name), __FUNCTION__);                  \
-  dbus::MethodCall method_call_name(cryptohome::kCryptohomeInterface, \
-                                    method_name);
-// The CryptohomeClient implementation.
-class CryptohomeClientImpl : public CryptohomeClient {
- public:
-  explicit CryptohomeClientImpl(dbus::Bus* bus)
-      : proxy_(bus->GetObjectProxy(
-            cryptohome::kCryptohomeServiceName,
-            dbus::ObjectPath(cryptohome::kCryptohomeServicePath))),
-        weak_ptr_factory_(this),
-        blocking_method_caller_(bus, proxy_) {
-    proxy_->ConnectToSignal(
-        cryptohome::kCryptohomeInterface,
-        cryptohome::kSignalAsyncCallStatus,
-        base::Bind(&CryptohomeClientImpl::OnAsyncCallStatus,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&CryptohomeClientImpl::OnSignalConnected,
-                   weak_ptr_factory_.GetWeakPtr()));
-  }
-
-  // CryptohomeClient override.
-  virtual void SetAsyncCallStatusHandler(AsyncCallStatusHandler handler)
-      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 {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeIsMounted);
-    return CallBoolMethodAndBlock(&method_call, is_mounted);
-  }
-
-  // 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,
-                             const std::string& key,
-                             AsyncMethodCallback callback) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeAsyncCheckKey);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(username);
-    writer.AppendString(key);
-    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                       base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,
-                                  weak_ptr_factory_.GetWeakPtr(),
-                                  callback));
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncMigrateKey(const std::string& username,
-                               const std::string& from_key,
-                               const std::string& to_key,
-                               AsyncMethodCallback callback) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeAsyncMigrateKey);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(username);
-    writer.AppendString(from_key);
-    writer.AppendString(to_key);
-    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                       base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,
-                                  weak_ptr_factory_.GetWeakPtr(),
-                                  callback));
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncRemove(const std::string& username,
-                           AsyncMethodCallback callback) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeAsyncRemove);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(username);
-    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                       base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,
-                                  weak_ptr_factory_.GetWeakPtr(),
-                                  callback));
-  }
-
-  // CryptohomeClient override.
-  virtual bool GetSystemSalt(std::vector<uint8>* salt) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeGetSystemSalt);
-    scoped_ptr<dbus::Response> response(
-        blocking_method_caller_.CallMethodAndBlock(&method_call));
-    if (!response.get())
-      return false;
-    dbus::MessageReader reader(response.get());
-    uint8* bytes = NULL;
-    size_t length = 0;
-    if (!reader.PopArrayOfBytes(&bytes, &length))
-      return false;
-    salt->assign(bytes, bytes + length);
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncMount(const std::string& username,
-                          const std::string& key,
-                          const bool create_if_missing,
-                          AsyncMethodCallback callback) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeAsyncMount);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(username);
-    writer.AppendString(key);
-    writer.AppendBool(create_if_missing);
-    writer.AppendBool(false);  // deprecated_replace_tracked_subdirectories
-    // deprecated_tracked_subdirectories
-    writer.AppendArrayOfStrings(std::vector<std::string>());
-    proxy_->CallMethod(&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                       base::Bind(&CryptohomeClientImpl::OnAsyncMethodCall,
-                                  weak_ptr_factory_.GetWeakPtr(),
-                                  callback));
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncMountGuest(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 {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsReady);
-    return CallBoolMethodAndBlock(&method_call, ready);
-  }
-
-  // CryptohomeClient override.
-  virtual void TpmIsEnabled(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));
-  }
-
-  // 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 {
-    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);
-  }
-
-  // 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 {
-    INITIALIZE_METHOD_CALL(method_call, cryptohome::kCryptohomeTpmIsBeingOwned);
-    return CallBoolMethodAndBlock(&method_call, owning);
-  }
-
-  // CryptohomeClient override.
-  virtual bool TpmCanAttemptOwnership() OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomeTpmCanAttemptOwnership);
-    scoped_ptr<dbus::Response> response(
-        blocking_method_caller_.CallMethodAndBlock(&method_call));
-    return response.get() != NULL;
-  }
-
-  // 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;
-  }
-
-  // CryptohomeClient override.
-  virtual void Pkcs11IsTpmTokenReady(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));
-  }
-
-  // CryptohomeClient override.
-  virtual void Pkcs11GetTpmTokenInfo(Pkcs11GetTpmTokenInfoCallback callback)
-      OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomePkcs11GetTpmTokenInfo);
-    proxy_->CallMethod(
-        &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(
-            &CryptohomeClientImpl::OnPkcs11GetTpmTokenInfo,
-            weak_ptr_factory_.GetWeakPtr(),
-            callback));
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesGet(const std::string& name,
-                                    std::vector<uint8>* value,
-                                    bool* successful) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomeInstallAttributesGet);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(name);
-    scoped_ptr<dbus::Response> response(
-        blocking_method_caller_.CallMethodAndBlock(&method_call));
-    if (!response.get())
-      return false;
-    dbus::MessageReader reader(response.get());
-    uint8* bytes = NULL;
-    size_t length = 0;
-    if (!reader.PopArrayOfBytes(&bytes, &length) ||
-        !reader.PopBool(successful))
-      return false;
-    value->assign(bytes, bytes + length);
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesSet(const std::string& name,
-                                    const std::vector<uint8>& value,
-                                    bool* successful) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomeInstallAttributesSet);
-    dbus::MessageWriter writer(&method_call);
-    writer.AppendString(name);
-    writer.AppendArrayOfBytes(value.data(), value.size());
-    return CallBoolMethodAndBlock(&method_call, successful);
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesFinalize(bool* successful) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomeInstallAttributesFinalize);
-    return CallBoolMethodAndBlock(&method_call, successful);
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesIsReady(bool* is_ready) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomeInstallAttributesIsReady);
-    return CallBoolMethodAndBlock(&method_call, is_ready);
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesIsInvalid(bool* is_invalid) OVERRIDE {
-    INITIALIZE_METHOD_CALL(method_call,
-                           cryptohome::kCryptohomeInstallAttributesIsInvalid);
-    return CallBoolMethodAndBlock(&method_call, is_invalid);
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) OVERRIDE
-  {
-    INITIALIZE_METHOD_CALL(
-        method_call, cryptohome::kCryptohomeInstallAttributesIsFirstInstall);
-    return CallBoolMethodAndBlock(&method_call, is_first_install);
-  }
-
- private:
-  // Handles the result of AsyncXXX methods.
-  void OnAsyncMethodCall(AsyncMethodCallback callback,
-                         dbus::Response* response) {
-    if (!response)
-      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 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);
-  }
-
-  // Handles responses for methods with a bool value result.
-  void OnBoolMethod(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)) {
-      callback.Run(DBUS_METHOD_CALL_FAILURE, false);
-      return;
-    }
-    callback.Run(DBUS_METHOD_CALL_SUCCESS, result);
-  }
-
-  // Handles responses for Pkcs11GetTpmtTokenInfo.
-  void OnPkcs11GetTpmTokenInfo(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;
-    if (!reader.PopString(&label) || !reader.PopString(&user_pin)) {
-      callback.Run(DBUS_METHOD_CALL_FAILURE, std::string(), std::string());
-      return;
-    }
-    callback.Run(DBUS_METHOD_CALL_SUCCESS, label, user_pin);
-  }
-
-  // Handles AsyncCallStatus signal.
-  void OnAsyncCallStatus(dbus::Signal* signal) {
-    dbus::MessageReader reader(signal);
-    int async_id = 0;
-    bool return_status = false;
-    int return_code = 0;
-    if (!reader.PopInt32(&async_id) ||
-        !reader.PopBool(&return_status) ||
-        !reader.PopInt32(&return_code)) {
-      LOG(ERROR) << "Invalid signal: " << signal->ToString();
-      return;
-    }
-    if (!async_call_status_handler_.is_null())
-      async_call_status_handler_.Run(async_id, return_status, return_code);
-  }
-
-  // Handles the result of signal connection setup.
-  void OnSignalConnected(const std::string& interface,
-                         const std::string& signal,
-                         bool successed) {
-    LOG_IF(ERROR, !successed) << "Connect to " << interface << " " <<
-        signal << " failed.";
-  }
-
-  dbus::ObjectProxy* proxy_;
-  base::WeakPtrFactory<CryptohomeClientImpl> weak_ptr_factory_;
-  BlockingMethodCaller blocking_method_caller_;
-  AsyncCallStatusHandler async_call_status_handler_;
-
-  DISALLOW_COPY_AND_ASSIGN(CryptohomeClientImpl);
-};
-
-// A stub implementaion of CryptohomeClient.
-class CryptohomeClientStubImpl : public CryptohomeClient {
- public:
-  CryptohomeClientStubImpl()
-      : weak_ptr_factory_(this),
-        async_call_id_(1),
-        tpm_is_ready_counter_(0),
-        locked_(false) {
-  }
-
-  virtual ~CryptohomeClientStubImpl() {}
-
-  // CryptohomeClient override.
-  virtual void SetAsyncCallStatusHandler(AsyncCallStatusHandler handler)
-      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;
-  }
-
-  // CryptohomeClient override.
-  virtual bool Unmount(bool* success) OVERRIDE {
-    *success = true;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncCheckKey(const std::string& username,
-                             const std::string& key,
-                             AsyncMethodCallback callback) OVERRIDE {
-    ReturnAsyncMethodResult(callback);
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncMigrateKey(const std::string& username,
-                               const std::string& from_key,
-                               const std::string& to_key,
-                               AsyncMethodCallback callback) OVERRIDE {
-    ReturnAsyncMethodResult(callback);
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncRemove(const std::string& username,
-                           AsyncMethodCallback callback) OVERRIDE {
-    ReturnAsyncMethodResult(callback);
-  }
-
-  // CryptohomeClient override.
-  virtual bool GetSystemSalt(std::vector<uint8>* salt) OVERRIDE {
-    const char kStubSystemSalt[] = "stub_system_salt";
-    salt->assign(kStubSystemSalt,
-                 kStubSystemSalt + arraysize(kStubSystemSalt));
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncMount(const std::string& username,
-                          const std::string& key,
-                          const bool create_if_missing,
-                          AsyncMethodCallback callback) OVERRIDE {
-    ReturnAsyncMethodResult(callback);
-  }
-
-  // CryptohomeClient override.
-  virtual void AsyncMountGuest(AsyncMethodCallback callback) OVERRIDE {
-    ReturnAsyncMethodResult(callback);
-  }
-
-  // CryptohomeClient override.
-  virtual bool TpmIsReady(bool* ready) OVERRIDE {
-    *ready = (tpm_is_ready_counter_++ > 20);
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual void TpmIsEnabled(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 {
-    const char kStubTpmPassword[] = "Stub-TPM-password";
-    *password = kStubTpmPassword;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool TpmIsOwned(bool* owned) OVERRIDE {
-    *owned = true;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool TpmIsBeingOwned(bool* owning) OVERRIDE {
-    *owning = true;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool TpmCanAttemptOwnership() OVERRIDE { return true; }
-
-  // CryptohomeClient override.
-  virtual bool TpmClearStoredPassword() OVERRIDE { return true; }
-
-  // CryptohomeClient override.
-  virtual void Pkcs11IsTpmTokenReady(BoolMethodCallback callback) OVERRIDE {
-    MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, true));
-  }
-
-  // CryptohomeClient override.
-  virtual void Pkcs11GetTpmTokenInfo(
-      Pkcs11GetTpmTokenInfoCallback callback) OVERRIDE {
-    const char kStubLabel[] = "Stub TPM Token";
-    const char kStubUserPin[] = "012345";
-    MessageLoop::current()->PostTask(
-        FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS, kStubLabel,
-                              kStubUserPin));
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesGet(const std::string& name,
-                                    std::vector<uint8>* value,
-                                    bool* successful) OVERRIDE {
-    if (install_attrs_.find(name) != install_attrs_.end()) {
-      *value = install_attrs_[name];
-      *successful = true;
-    } else {
-      value->clear();
-      *successful = false;
-    }
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesSet(const std::string& name,
-                                    const std::vector<uint8>& value,
-                                    bool* successful) OVERRIDE {
-    install_attrs_[name] = value;
-    *successful = true;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesFinalize(bool* successful) OVERRIDE {
-    locked_ = true;
-    *successful = true;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesIsReady(bool* is_ready) OVERRIDE {
-    *is_ready = true;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesIsInvalid(bool* is_invalid) OVERRIDE {
-    *is_invalid = false;
-    return true;
-  }
-
-  // CryptohomeClient override.
-  virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) OVERRIDE
-  {
-    *is_first_install = !locked_;
-    return true;
-  }
-
- private:
-  // Posts tasks which return fake results to the UI thread.
-  void ReturnAsyncMethodResult(AsyncMethodCallback callback) {
-    MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&CryptohomeClientStubImpl::ReturnAsyncMethodResultInternal,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   callback));
-  }
-
-  // This method is used to implement ReturnAsyncMethodResult.
-  void ReturnAsyncMethodResultInternal(AsyncMethodCallback callback) {
-    callback.Run(async_call_id_);
-    if (!async_call_status_handler_.is_null()) {
-      MessageLoop::current()->PostTask(
-          FROM_HERE,
-          base::Bind(async_call_status_handler_,
-                     async_call_id_,
-                     true,
-                     cryptohome::MOUNT_ERROR_NONE));
-    }
-    ++async_call_id_;
-  }
-
-  base::WeakPtrFactory<CryptohomeClientStubImpl> weak_ptr_factory_;
-  int async_call_id_;
-  AsyncCallStatusHandler async_call_status_handler_;
-  int tpm_is_ready_counter_;
-  std::map<std::string, std::vector<uint8> > install_attrs_;
-  bool locked_;
-
-  DISALLOW_COPY_AND_ASSIGN(CryptohomeClientStubImpl);
-};
-
-} // namespace
-
-////////////////////////////////////////////////////////////////////////////////
-// CryptohomeClient
-
-CryptohomeClient::CryptohomeClient() {}
-
-CryptohomeClient::~CryptohomeClient() {}
-
-// 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