Enhanced and refactored the AttestationFlow interface.

chromeos/cryptohome/mock_async_method_caller.h

Index: chromeos/cryptohome/mock_async_method_caller.h
diff --git a/chromeos/cryptohome/mock_async_method_caller.h b/chromeos/cryptohome/mock_async_method_caller.h
index 8fc2b8b2ad673ca6625c68404cba8861b898efc7..0bb0b29c3eade0c561ba4f799b5b85f58cf5cfda 100644
--- a/chromeos/cryptohome/mock_async_method_caller.h
+++ b/chromeos/cryptohome/mock_async_method_caller.h
@@ -20,6 +20,7 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
   static const char kFakeAttestationCertRequest[];
   static const char kFakeAttestationCert[];
   static const char kFakeSanitizedUsername[];
+  static const char kFakeChallengeResponse[];
 
   MockAsyncMethodCaller();
   virtual ~MockAsyncMethodCaller();
@@ -49,24 +50,24 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
                     const DataCallback& callback));
   MOCK_METHOD4(AsyncTpmAttestationFinishCertRequest,
                void(const std::string& pca_response,
-                    chromeos::CryptohomeClient::AttestationKeyType key_type,
+                    chromeos::attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const DataCallback& callback));
   MOCK_METHOD3(TpmAttestationRegisterKey,
-               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+               void(chromeos::attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const Callback& callback));
   MOCK_METHOD7(
       TpmAttestationSignEnterpriseChallenge,
-      void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+      void(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));
   MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
-               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+               void(chromeos::attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const std::string& challenge,
                     const DataCallback& callback));
@@ -84,6 +85,7 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
   void FakeCreateCertRequest(const DataCallback& callback);
   void FakeFinishCertRequest(const DataCallback& callback);
   void FakeGetSanitizedUsername(const DataCallback& callback);
+  void FakeEnterpriseChallenge(const DataCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(MockAsyncMethodCaller);
 };