Added support in CryptohomeClient for new attestation dbus calls.

Support for the asynchronous calls has also been added to the cryptohome
AsyncMethodCaller.

BUG=chromium:221929
TEST=chromeos_unittests


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

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

1 files changed, 16 insertions, 0 deletions

diff --git a/chromeos/cryptohome/mock_async_method_caller.h b/chromeos/cryptohome/mock_async_method_caller.h
index b7f8e41..c4e2ec1 100644
--- a/chromeos/cryptohome/mock_async_method_caller.h
+++ b/chromeos/cryptohome/mock_async_method_caller.h
@@ -52,6 +52,22 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
                     chromeos::CryptohomeClient::AttestationKeyType key_type,
                     const std::string& key_name,
                     const DataCallback& callback));
+  MOCK_METHOD3(TpmAttestationRegisterKey,
+               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+                    const std::string& key_name,
+                    const Callback& callback));
+  MOCK_METHOD6(TpmAttestationSignEnterpriseChallenge,
+               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+                    const std::string& key_name,
+                    const std::string& domain,
+                    const std::string& device_id,
+                    const std::string& challenge,
+                    const DataCallback& callback));
+  MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
+               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+                    const std::string& key_name,
+                    const std::string& challenge,
+                    const DataCallback& callback));
   MOCK_METHOD2(AsyncGetSanitizedUsername,
                void(const std::string& user,
                     const DataCallback& callback));