Added multi-profile support for attestation on chromeos.

chromeos/dbus/mock_cryptohome_client.h

Index: chromeos/dbus/mock_cryptohome_client.h
diff --git a/chromeos/dbus/mock_cryptohome_client.h b/chromeos/dbus/mock_cryptohome_client.h
index 76f3069ba0f5a6beff39ff1d24a0a9cc2e8820a8..8cb4c6b7639ab25e8a8e6cc844024a01d3d40180 100644
--- a/chromeos/dbus/mock_cryptohome_client.h
+++ b/chromeos/dbus/mock_cryptohome_client.h
@@ -99,49 +99,58 @@ class MockCryptohomeClient : public CryptohomeClient {
   MOCK_METHOD4(
       AsyncTpmAttestationCreateCertRequest,
       void(attestation::AttestationCertificateProfile certificate_profile,
-           const std::string& user_email,
+           const std::string& user_id,
            const std::string& request_origin,
            const AsyncMethodCallback& callback));
-  MOCK_METHOD4(AsyncTpmAttestationFinishCertRequest,
+  MOCK_METHOD5(AsyncTpmAttestationFinishCertRequest,
                void(const std::string& pca_response,
                     attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const AsyncMethodCallback& callback));
-  MOCK_METHOD3(TpmAttestationDoesKeyExist,
+  MOCK_METHOD4(TpmAttestationDoesKeyExist,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const BoolDBusMethodCallback& callback));
-  MOCK_METHOD3(TpmAttestationGetCertificate,
+  MOCK_METHOD4(TpmAttestationGetCertificate,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const DataMethodCallback& callback));
-  MOCK_METHOD3(TpmAttestationGetPublicKey,
+  MOCK_METHOD4(TpmAttestationGetPublicKey,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const DataMethodCallback& callback));
-  MOCK_METHOD3(TpmAttestationRegisterKey,
+  MOCK_METHOD4(TpmAttestationRegisterKey,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const AsyncMethodCallback& callback));
-  MOCK_METHOD7(TpmAttestationSignEnterpriseChallenge,
+  MOCK_METHOD8(TpmAttestationSignEnterpriseChallenge,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const std::string& domain,
                     const std::string& device_id,
                     attestation::AttestationChallengeOptions options,
                     const std::string& challenge,
                     const AsyncMethodCallback& callback));
-  MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
+  MOCK_METHOD5(TpmAttestationSignSimpleChallenge,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const std::string& challenge,
                     const AsyncMethodCallback& callback));
-  MOCK_METHOD3(TpmAttestationGetKeyPayload,
+  MOCK_METHOD4(TpmAttestationGetKeyPayload,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const DataMethodCallback& callback));
-  MOCK_METHOD4(TpmAttestationSetKeyPayload,
+  MOCK_METHOD5(TpmAttestationSetKeyPayload,
                void(attestation::AttestationKeyType key_type,
+                    const std::string& user_id,
                     const std::string& key_name,
                     const std::string& payload,
                     const BoolDBusMethodCallback& callback));