Device enterprise registration with a certificate.

chromeos/attestation/attestation_flow.cc

Index: chromeos/attestation/attestation_flow.cc
diff --git a/chromeos/attestation/attestation_flow.cc b/chromeos/attestation/attestation_flow.cc
index 45e4c896a96cfe43d78998db74ac1caa36541bc9..e765f7d29df8bbc1a00be66bf717dd088300de2c 100644
--- a/chromeos/attestation/attestation_flow.cc
+++ b/chromeos/attestation/attestation_flow.cc
@@ -57,9 +57,11 @@ void DBusDataMethodCallback(
     callback.Run(result, data);
 }
 
-AttestationKeyType GetKeyTypeForProfile(
-    AttestationCertificateProfile profile) {
-  switch (profile) {
+}  // namespace
+
+AttestationKeyType AttestationFlow::GetKeyTypeForProfile(
+    AttestationCertificateProfile certificate_profile) {
+  switch (certificate_profile) {
     case PROFILE_ENTERPRISE_MACHINE_CERTIFICATE:
     case PROFILE_ENTERPRISE_ENROLLMENT_CERTIFICATE:
       return KEY_DEVICE;
@@ -71,23 +73,22 @@ AttestationKeyType GetKeyTypeForProfile(
   return KEY_USER;
 }
 
-std::string GetKeyNameForProfile(AttestationCertificateProfile profile,
-                                 const std::string& origin) {
-  switch (profile) {
+std::string AttestationFlow::GetKeyNameForProfile(
+    AttestationCertificateProfile certificate_profile,
+    const std::string& request_origin) {
+  switch (certificate_profile) {
     case PROFILE_ENTERPRISE_MACHINE_CERTIFICATE:
     case PROFILE_ENTERPRISE_ENROLLMENT_CERTIFICATE:
       return kEnterpriseMachineKey;
     case PROFILE_ENTERPRISE_USER_CERTIFICATE:
       return kEnterpriseUserKey;
     case PROFILE_CONTENT_PROTECTION_CERTIFICATE:
-      return std::string(kContentProtectionKeyPrefix) + origin;
+      return std::string(kContentProtectionKeyPrefix) + request_origin;
   }
   NOTREACHED();
   return "";
 }
 
-}  // namespace
-
 AttestationFlow::AttestationFlow(cryptohome::AsyncMethodCaller* async_caller,
                                  CryptohomeClient* cryptohome_client,
                                  std::unique_ptr<ServerProxy> server_proxy)