Enhanced and refactored the AttestationFlow interface.

chromeos/dbus/mock_cryptohome_client.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
 #define CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
 
 #include <string>
 
 #include "chromeos/dbus/cryptohome_client.h"
@@ skipping 70 matching lines @@
   MOCK_METHOD1(AsyncTpmAttestationCreateEnrollRequest,
                void(const AsyncMethodCallback& callback));
   MOCK_METHOD2(AsyncTpmAttestationEnroll,
                void(const std::string& pca_response,
                     const AsyncMethodCallback& callback));
   MOCK_METHOD2(AsyncTpmAttestationCreateCertRequest,
                void(int options,
                     const AsyncMethodCallback& callback));
   MOCK_METHOD4(AsyncTpmAttestationFinishCertRequest,
                void(const std::string& pca_response,
-                    AttestationKeyType key_type,
+                    attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const AsyncMethodCallback& callback));
   MOCK_METHOD3(TpmAttestationDoesKeyExist,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const BoolDBusMethodCallback& callback));
   MOCK_METHOD3(TpmAttestationGetCertificate,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const DataMethodCallback& callback));
   MOCK_METHOD3(TpmAttestationGetPublicKey,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const DataMethodCallback& callback));
   MOCK_METHOD3(TpmAttestationRegisterKey,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const AsyncMethodCallback& callback));
   MOCK_METHOD7(TpmAttestationSignEnterpriseChallenge,
-               void(AttestationKeyType key_type,
+               void(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));
   MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const std::string& challenge,
                     const AsyncMethodCallback& callback));
   MOCK_METHOD3(TpmAttestationGetKeyPayload,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const DataMethodCallback& callback));
   MOCK_METHOD4(TpmAttestationSetKeyPayload,
-               void(AttestationKeyType key_type,
+               void(attestation::AttestationKeyType key_type,
                     const std::string& key_name,
                     const std::string& payload,
                     const BoolDBusMethodCallback& callback));
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_