Enhanced and refactored the AttestationFlow interface.

This change makes the AttestationFlow interface easier to work with.
Supported certificate profiles are explicitly defined and the clobbering
of existing keys is now optional.

All attestation constants have been consolidated in
attestation_constants.h.

BUG=chromium:219959
TEST=unit

Review URL: https://chromiumcodereview.appspot.com/14305009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196926 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 10 deletions

diff --git a/chromeos/dbus/fake_cryptohome_client.h b/chromeos/dbus/fake_cryptohome_client.h
index fbdce7a..fd05882 100644
--- a/chromeos/dbus/fake_cryptohome_client.h
+++ b/chromeos/dbus/fake_cryptohome_client.h
@@ -86,44 +86,44 @@ class FakeCryptohomeClient : public CryptohomeClient {
       const AsyncMethodCallback& callback) OVERRIDE;
   virtual void AsyncTpmAttestationFinishCertRequest(
       const std::string& pca_response,
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const AsyncMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationDoesKeyExist(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const BoolDBusMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationGetCertificate(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationGetPublicKey(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationRegisterKey(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const AsyncMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationSignEnterpriseChallenge(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
-      AttestationChallengeOptions options,
+      attestation::AttestationChallengeOptions options,
       const std::string& challenge,
       const AsyncMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationSignSimpleChallenge(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& challenge,
       const AsyncMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationGetKeyPayload(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataMethodCallback& callback) OVERRIDE;
   virtual void TpmAttestationSetKeyPayload(
-      AttestationKeyType key_type,
+      attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& payload,
       const BoolDBusMethodCallback& callback) OVERRIDE;