Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/cryptohome_client_stub.h

Issue 24637004: cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chromeos/chromeos.gyp ('K') | « chromeos/dbus/cryptohome_client.cc ('k') | chromeos/dbus/cryptohome_client_stub.cc » ('j') | chromeos/dbus/fake_cryptohome_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/cryptohome_client_stub.h
diff --git a/chromeos/dbus/cryptohome_client_stub.h b/chromeos/dbus/cryptohome_client_stub.h
deleted file mode 100644
index 0e90f8863dede58dec7b29d29732303c544ba133..0000000000000000000000000000000000000000
--- a/chromeos/dbus/cryptohome_client_stub.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef CHROMEOS_DBUS_CRYPTOHOME_CLIENT_STUB_H_
-#define CHROMEOS_DBUS_CRYPTOHOME_CLIENT_STUB_H_
-
-#include <map>
-
-#include "base/basictypes.h"
-#include "base/memory/weak_ptr.h"
-#include "chromeos/dbus/cryptohome_client.h"
-
-namespace chromeos {
-
-class CHROMEOS_EXPORT CryptohomeClientStubImpl : public CryptohomeClient {
- public:
- CryptohomeClientStubImpl();
- virtual ~CryptohomeClientStubImpl();
-
- virtual void Init(dbus::Bus* bus) OVERRIDE;
- virtual void SetAsyncCallStatusHandlers(
- const AsyncCallStatusHandler& handler,
- const AsyncCallStatusWithDataHandler& data_handler) OVERRIDE;
- virtual void ResetAsyncCallStatusHandlers() OVERRIDE;
- virtual void IsMounted(const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual bool Unmount(bool* success) OVERRIDE;
- virtual void AsyncCheckKey(const std::string& username,
- const std::string& key,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncMigrateKey(const std::string& username,
- const std::string& from_key,
- const std::string& to_key,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncRemove(const std::string& username,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual bool GetSystemSalt(std::vector<uint8>* salt) OVERRIDE;
- virtual void GetSanitizedUsername(
- const std::string& username,
- const StringDBusMethodCallback& callback) OVERRIDE;
- virtual std::string BlockingGetSanitizedUsername(
- const std::string& username) OVERRIDE;
- virtual void AsyncMount(const std::string& username,
- const std::string& key,
- int flags,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncAddKey(const std::string& username,
- const std::string& key,
- const std::string& new_key,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncMountGuest(const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncMountPublic(const std::string& public_mount_id,
- int flags,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void TpmIsReady(const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual void TpmIsEnabled(const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual bool CallTpmIsEnabledAndBlock(bool* enabled) OVERRIDE;
- virtual void TpmGetPassword(
- const StringDBusMethodCallback& callback) OVERRIDE;
- virtual void TpmIsOwned(const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual bool CallTpmIsOwnedAndBlock(bool* owned) OVERRIDE;
- virtual void TpmIsBeingOwned(const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual bool CallTpmIsBeingOwnedAndBlock(bool* owning) OVERRIDE;
- virtual void TpmCanAttemptOwnership(
- const VoidDBusMethodCallback& callback) OVERRIDE;
- virtual void TpmClearStoredPassword(
- const VoidDBusMethodCallback& callback) OVERRIDE;
- virtual bool CallTpmClearStoredPasswordAndBlock() OVERRIDE;
- virtual void Pkcs11IsTpmTokenReady(
- const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual void Pkcs11GetTpmTokenInfo(
- const Pkcs11GetTpmTokenInfoCallback& callback) OVERRIDE;
- virtual bool InstallAttributesGet(const std::string& name,
- std::vector<uint8>* value,
- bool* successful) OVERRIDE;
- virtual bool InstallAttributesSet(const std::string& name,
- const std::vector<uint8>& value,
- bool* successful) OVERRIDE;
- virtual bool InstallAttributesFinalize(bool* successful) OVERRIDE;
- virtual void InstallAttributesIsReady(
- const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual bool InstallAttributesIsInvalid(bool* is_invalid) OVERRIDE;
- virtual bool InstallAttributesIsFirstInstall(bool* is_first_install) OVERRIDE;
- virtual void TpmAttestationIsPrepared(
- const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationIsEnrolled(
- const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual void AsyncTpmAttestationCreateEnrollRequest(
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncTpmAttestationEnroll(
- const std::string& pca_response,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncTpmAttestationCreateCertRequest(
- attestation::AttestationCertificateProfile certificate_profile,
- const std::string& user_email,
- const std::string& request_origin,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void AsyncTpmAttestationFinishCertRequest(
- const std::string& pca_response,
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationDoesKeyExist(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const BoolDBusMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationGetCertificate(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const DataMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationGetPublicKey(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const DataMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationRegisterKey(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationSignEnterpriseChallenge(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const std::string& domain,
- const std::string& device_id,
- attestation::AttestationChallengeOptions options,
- const std::string& challenge,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationSignSimpleChallenge(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const std::string& challenge,
- const AsyncMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationGetKeyPayload(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const DataMethodCallback& callback) OVERRIDE;
- virtual void TpmAttestationSetKeyPayload(
- attestation::AttestationKeyType key_type,
- const std::string& key_name,
- const std::string& payload,
- const BoolDBusMethodCallback& callback) OVERRIDE;
-
- private:
- // Posts tasks which return fake results to the UI thread.
- void ReturnAsyncMethodResult(const AsyncMethodCallback& callback,
- bool returns_data);
-
- // This method is used to implement ReturnAsyncMethodResult.
- void ReturnAsyncMethodResultInternal(const AsyncMethodCallback& callback,
- bool returns_data);
-
- int async_call_id_;
- AsyncCallStatusHandler async_call_status_handler_;
- AsyncCallStatusWithDataHandler async_call_status_data_handler_;
- int tpm_is_ready_counter_;
-
- // A stub store for InstallAttributes, mapping an attribute name to the
- // associated data blob. Used to implement InstallAttributesSet and -Get.
- std::map<std::string, std::vector<uint8> > install_attrs_;
- bool locked_;
- base::WeakPtrFactory<CryptohomeClientStubImpl> weak_ptr_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(CryptohomeClientStubImpl);
-};
-
-} // namespace chromeos
-
-#endif // CHROMEOS_DBUS_CRYPTOHOME_CLIENT_STUB_H_
« chromeos/chromeos.gyp ('K') | « chromeos/dbus/cryptohome_client.cc ('k') | chromeos/dbus/cryptohome_client_stub.cc » ('j') | chromeos/dbus/fake_cryptohome_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698