Added multi-profile support for attestation on chromeos.

chromeos/attestation/attestation_flow.h

Index: chromeos/attestation/attestation_flow.h
diff --git a/chromeos/attestation/attestation_flow.h b/chromeos/attestation/attestation_flow.h
index bdbea1ef7fc688d782c32c7dea9e1fd4b04137fd..4b431f57646070a90e48452e72961291bf0c5068 100644
--- a/chromeos/attestation/attestation_flow.h
+++ b/chromeos/attestation/attestation_flow.h
@@ -69,7 +69,7 @@ class CHROMEOS_EXPORT AttestationFlow {
   //   certificate_profile - Specifies what kind of certificate should be
   //                         requested from the CA.
   //   user_email - The canonical email address of the currently active user.
-  //                This is ignored when not using the content protection
+  //                This is ignored when using the enterprise machine cert
   //                profile.
   //   request_origin - For content protection profiles, certificate requests
   //                    are origin-specific.  This string must uniquely identify
@@ -159,11 +159,13 @@ class CHROMEOS_EXPORT AttestationFlow {
   //
   // Parameters
   //   key_type - The type of the key for which a certificate is requested.
+  //   user_email - The active user's canonical email.

[bartfab (slow), 2013/10/13 16:31:35]

As elsewhere, please use user_id.

[Darren Krahn, 2013/10/15 16:49:06]

Done.

   //   key_name - The name of the key for which a certificate is requested.
   //   callback - Called when the operation completes.
   //   success - The status of request creation.
   //   data - The request data for the Privacy CA.
   void SendCertificateRequestToPCA(AttestationKeyType key_type,
+                                   const std::string& user_email,
                                    const std::string& key_name,
                                    const CertificateCallback& callback,
                                    bool success,
@@ -175,11 +177,13 @@ class CHROMEOS_EXPORT AttestationFlow {
   //
   // Parameters
   //   key_type - The type of the key for which a certificate is requested.
+  //   user_email - The active user's canonical email.
   //   key_name - The name of the key for which a certificate is requested.
   //   callback - Called when the operation completes.
   //   success - The status of the Privacy CA operation.
   //   data - The response data from the Privacy CA.
   void SendCertificateResponseToDaemon(AttestationKeyType key_type,
+                                       const std::string& user_email,
                                        const std::string& key_name,
                                        const CertificateCallback& callback,
                                        bool success,
@@ -189,9 +193,11 @@ class CHROMEOS_EXPORT AttestationFlow {
   //
   // Parameters
   //   key_type - The type of the key for which a certificate is requested.
+  //   user_email - The active user's canonical email.
   //   key_name - The name of the key for which a certificate is requested.
   //   callback - Called when the operation completes.
   void GetExistingCertificate(AttestationKeyType key_type,
+                              const std::string& user_email,
                               const std::string& key_name,
                               const CertificateCallback& callback);