Tidy-up some leftover after AttestationClient migration.

There are some inconsistent comments and function calls after the
migration.

BUG=b:158955123
TEST=unit_tests.

Change-Id: I1038e52492e5c4a45e422b4d1cf7ac086cc31e77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519638Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Leo Lai <cylai@google.com>
Cr-Commit-Position: refs/heads/master@{#824302}

chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl.cc

@@ -37,7 +37,7 @@ void DBusPrivacyCACallback(
     on_success.Run(data);
     return;
   }
-  LOG(ERROR) << "Cryptohome DBus method or server called failed with status: "
+  LOG(ERROR) << "Attestation DBus method or server called failed with status: "
              << status << ": " << from_here.ToString();
   if (!on_failure.is_null())
     on_failure.Run(status);

chrome/browser/chromeos/attestation/machine_certificate_uploader_impl.cc

@@ -55,7 +55,7 @@ void DBusPrivacyCACallback(
     on_success.Run(data);
     return;
   }
-  LOG(ERROR) << "Cryptohome DBus method or server called failed with status:"
+  LOG(ERROR) << "Attestation DBus method or server called failed with status:"
              << status << ": " << from_here.ToString();
   if (!on_failure.is_null())
     on_failure.Run(status);

chrome/browser/chromeos/attestation/tpm_challenge_key_subtle.cc

@@ -405,9 +405,7 @@ void TpmChallengeKeySubtleImpl::GetEnrollmentPreparationsCallback(
   }
 
   ::attestation::GetKeyInfoRequest request;
-  request.set_username(
-      cryptohome::CreateAccountIdentifierFromAccountId(GetAccountId())
-          .account_id());
+  request.set_username(cryptohome::Identification(GetAccountId()).id());
   request.set_key_label(key_name_);
   AttestationClient::Get()->GetKeyInfo(
       request, base::BindOnce(&TpmChallengeKeySubtleImpl::DoesKeyExistCallback,
@@ -509,9 +507,7 @@ void TpmChallengeKeySubtleImpl::GetPublicKey() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   ::attestation::GetKeyInfoRequest request;
-  request.set_username(
-      cryptohome::CreateAccountIdentifierFromAccountId(GetAccountId())
-          .account_id());
+  request.set_username(cryptohome::Identification(GetAccountId()).id());
   request.set_key_label(key_name_);
   AttestationClient::Get()->GetKeyInfo(
       request, base::BindOnce(&TpmChallengeKeySubtleImpl::PrepareKeyFinished,