| Index: chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| index 0a25469212a068040afa8b9aee93d31fd2b44cf3..d21ab528f7a30ed2e63d6a153fb0a0e094137c8e 100644
|
| --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
|
| @@ -324,44 +324,44 @@ class FakeCryptohomeClient : public chromeos::CryptohomeClient {
|
| const AsyncMethodCallback& callback) OVERRIDE {}
|
| virtual void AsyncTpmAttestationFinishCertRequest(
|
| const std::string& pca_response,
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const AsyncMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationDoesKeyExist(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const chromeos::BoolDBusMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationGetCertificate(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const DataMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationGetPublicKey(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const DataMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationRegisterKey(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const AsyncMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationSignEnterpriseChallenge(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const std::string& domain,
|
| const std::string& device_id,
|
| - AttestationChallengeOptions options,
|
| + chromeos::attestation::AttestationChallengeOptions options,
|
| const std::string& challenge,
|
| const AsyncMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationSignSimpleChallenge(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const std::string& challenge,
|
| const AsyncMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationGetKeyPayload(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const DataMethodCallback& callback) OVERRIDE {}
|
| virtual void TpmAttestationSetKeyPayload(
|
| - AttestationKeyType key_type,
|
| + chromeos::attestation::AttestationKeyType key_type,
|
| const std::string& key_name,
|
| const std::string& payload,
|
| const chromeos::BoolDBusMethodCallback& callback) OVERRIDE {}
|
|
|