Added support for the content protection profile to AttestationFlow.

chromeos/dbus/cryptohome_client.h

Index: chromeos/dbus/cryptohome_client.h
diff --git a/chromeos/dbus/cryptohome_client.h b/chromeos/dbus/cryptohome_client.h
index d17c0d767391e1725f109473e9b0f5682a70e731..547033d4e86884ad78beb01e9e7c094b5bf5463e 100644
--- a/chromeos/dbus/cryptohome_client.h
+++ b/chromeos/dbus/cryptohome_client.h
@@ -242,14 +242,18 @@ class CHROMEOS_EXPORT CryptohomeClient {
       const AsyncMethodCallback& callback) = 0;
 
   // Asynchronously creates an attestation certificate request according to
-  // |options|, which is a combination of AttestationCertificateOptions.
-  // |callback| will be called when the dbus call completes.  When the operation
-  // completes, the AsyncCallStatusWithDataHandler signal handler is called.
-  // The data that is sent with the signal is a certificate request to be sent
-  // to the Privacy CA.  The certificate request is completed by calling
-  // AsyncTpmAttestationFinishCertRequest.
+  // |certificate_profile|.  Some profiles require that the |user_email| of the
+  // currently active user and an identifier of the |request_origin| be
+  // provided.  |callback| will be called when the dbus call completes.  When
+  // the operation completes, the AsyncCallStatusWithDataHandler signal handler
+  // is called.  The data that is sent with the signal is a certificate request
+  // to be sent to the Privacy CA.  The certificate request is completed by
+  // calling AsyncTpmAttestationFinishCertRequest.  The |user_email| will not
+  // be included in the certificate request for the Privacy CA.
   virtual void AsyncTpmAttestationCreateCertRequest(
-      int options,
+      int certificate_profile,

[Mattias Nissler (ping if slow), 2013/07/29 09:19:25]

The type is a bit unfortunate, and the comment doesn't explain what values are
valid here. I guess it would make sense to move the enum definition into
third_party/cros_system_api/dbus/service_constants.h?

[dkrahn, 2013/08/08 01:29:29]

Finally getting back to this... and I don't know why I did this.  I already have
an enum defined.  It doesn't work well in system_api because that would
introduce a dup symbol in cryptohome but it's better than an int.

+      const std::string& user_email,
+      const std::string& request_origin,
       const AsyncMethodCallback& callback) = 0;
 
   // Asynchronously finishes a certificate request operation.  The callback will