Added support for the content protection profile to AttestationFlow.

chromeos/cryptohome/async_method_caller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
 #define CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "chromeos/attestation/attestation_constants.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace cryptohome {
 
 // Note: This file is placed in ::cryptohome instead of ::chromeos::cryptohome
 // since there is already a namespace ::cryptohome which holds the error code
 // enum (MountError) and referencing ::chromeos::cryptohome and ::cryptohome
 // within the same code is confusing.
@@ skipping 84 matching lines @@
   virtual void AsyncTpmAttestationCreateEnrollRequest(
       const DataCallback& callback) = 0;
 
   // Asks cryptohomed to asynchronously finish an attestation enrollment.
   // |pca_response| is the response to the enrollment request emitted by the
   // Privacy CA.
   virtual void AsyncTpmAttestationEnroll(const std::string& pca_response,
                                          const Callback& callback) = 0;
 
   // Asks cryptohomed to asynchronously create an attestation certificate
-  // request according to |options|, which is a combination of
-  // attestation::AttestationCertificateOptions.  On success the data sent to
-  // |callback| is a request to be sent to the Privacy CA.
+  // request according to |certificate_profile|.  Some profiles require that the
+  // |user_email| of the currently active user and an identifier of the
+  // |request_origin| be provided.  On success the data sent to |callback| is a
+  // request to be sent to the Privacy CA.  The |request_origin| may be sent to
+  // the Privacy CA but the |user_email| will never be sent.
   virtual void AsyncTpmAttestationCreateCertRequest(
-      int options,
+      chromeos::attestation::AttestationCertificateProfile certificate_profile,
+      const std::string& user_email,
+      const std::string& request_origin,
       const DataCallback& callback) = 0;
 
   // Asks cryptohomed to asynchronously finish an attestation certificate
   // request.  On success the data sent to |callback| is a certificate chain
   // in PEM format.  |pca_response| is the response to the certificate request
   // emitted by the Privacy CA.  |key_type| determines whether the certified key
   // is to be associated with the current user.  |key_name| is a name for the
   // key.
   virtual void AsyncTpmAttestationFinishCertRequest(
       const std::string& pca_response,
@@ skipping 52 matching lines @@
   static void Shutdown();
 
   // Returns a pointer to the global AsyncMethodCaller instance.
   // Initialize() should already have been called.
   static AsyncMethodCaller* GetInstance();
 };
 
 }  // namespace cryptohome
 
 #endif  // CHROMEOS_CRYPTOHOME_ASYNC_METHOD_CALLER_H_