| 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 8f3796bb2912333369b4fb795428ec5dd97af7c5..e41457a71e55ae1a7ad66f30e3d35eb87f5701b3 100644
|
| --- a/chromeos/cryptohome/mock_async_method_caller.h
|
| +++ b/chromeos/cryptohome/mock_async_method_caller.h
|
| @@ -55,29 +55,33 @@ class MockAsyncMethodCaller : public AsyncMethodCaller {
|
| MOCK_METHOD4(
|
| AsyncTpmAttestationCreateCertRequest,
|
| void(chromeos::attestation::AttestationCertificateProfile profile,
|
| - const std::string& user_email,
|
| + const std::string& user_id,
|
| const std::string& request_origin,
|
| const DataCallback& callback));
|
| - MOCK_METHOD4(AsyncTpmAttestationFinishCertRequest,
|
| + MOCK_METHOD5(AsyncTpmAttestationFinishCertRequest,
|
| void(const std::string& pca_response,
|
| chromeos::attestation::AttestationKeyType key_type,
|
| + const std::string& user_id,
|
| const std::string& key_name,
|
| const DataCallback& callback));
|
| - MOCK_METHOD3(TpmAttestationRegisterKey,
|
| + MOCK_METHOD4(TpmAttestationRegisterKey,
|
| void(chromeos::attestation::AttestationKeyType key_type,
|
| + const std::string& user_id,
|
| const std::string& key_name,
|
| const Callback& callback));
|
| - MOCK_METHOD7(
|
| + MOCK_METHOD8(
|
| TpmAttestationSignEnterpriseChallenge,
|
| void(chromeos::attestation::AttestationKeyType key_type,
|
| + const std::string& user_id,
|
| const std::string& key_name,
|
| const std::string& domain,
|
| const std::string& device_id,
|
| chromeos::attestation::AttestationChallengeOptions options,
|
| const std::string& challenge,
|
| const DataCallback& callback));
|
| - MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
|
| + MOCK_METHOD5(TpmAttestationSignSimpleChallenge,
|
| void(chromeos::attestation::AttestationKeyType key_type,
|
| + const std::string& user_id,
|
| const std::string& key_name,
|
| const std::string& challenge,
|
| const DataCallback& callback));
|
|
|