Enhanced and refactored the AttestationFlow interface.

chromeos/cryptohome/async_method_caller.cc

Index: chromeos/cryptohome/async_method_caller.cc
diff --git a/chromeos/cryptohome/async_method_caller.cc b/chromeos/cryptohome/async_method_caller.cc
index 24781829bf72f361c15c07effebb2859b9f06bbd..97c64e2e5a33052c74f0c7ecc9d6c4c7da44a60b 100644
--- a/chromeos/cryptohome/async_method_caller.cc
+++ b/chromeos/cryptohome/async_method_caller.cc
@@ -123,7 +123,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
 
   virtual void AsyncTpmAttestationFinishCertRequest(
       const std::string& pca_response,
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataCallback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
@@ -139,7 +139,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   }
 
   virtual void TpmAttestationRegisterKey(
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const Callback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
@@ -154,11 +154,11 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   }
 
   virtual void TpmAttestationSignEnterpriseChallenge(
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
-      chromeos::CryptohomeClient::AttestationChallengeOptions options,
+      chromeos::attestation::AttestationChallengeOptions options,
       const std::string& challenge,
       const DataCallback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
@@ -177,7 +177,7 @@ class AsyncMethodCallerImpl : public AsyncMethodCaller {
   }
 
   virtual void TpmAttestationSignSimpleChallenge(
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& challenge,
       const DataCallback& callback) OVERRIDE {