Enhanced and refactored the AttestationFlow interface.

chrome/browser/chromeos/attestation/attestation_policy_observer.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/chromeos/attestation/attestation_policy_observer.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
@@ skipping 125 matching lines @@
   }
 
   // Start a dbus call to check if an Enterprise Machine Key already exists.
   base::Closure on_does_exist =
       base::Bind(&AttestationPolicyObserver::GetExistingCertificate,
                  weak_factory_.GetWeakPtr());
   base::Closure on_does_not_exist =
       base::Bind(&AttestationPolicyObserver::GetNewCertificate,
                  weak_factory_.GetWeakPtr());
   cryptohome_client_->TpmAttestationDoesKeyExist(
-      CryptohomeClient::DEVICE_KEY,
+      DEVICE_KEY,
       kEnterpriseMachineKey,
       base::Bind(DBusBoolRedirectCallback, on_does_exist, on_does_not_exist));
 }
 
 void AttestationPolicyObserver::GetNewCertificate() {
   // We can reuse the dbus callback handler logic.
   attestation_flow_->GetCertificate(
-      kEnterpriseMachineKey,
+      ENTERPRISE_MACHINE_CERTIFICATE,
+      true,  // Force a new key to be generated.
       base::Bind(DBusStringCallback,
                  base::Bind(&AttestationPolicyObserver::UploadCertificate,
                             weak_factory_.GetWeakPtr()),
                  DBUS_METHOD_CALL_SUCCESS));
 }
 
 void AttestationPolicyObserver::GetExistingCertificate() {
   cryptohome_client_->TpmAttestationGetCertificate(
-      CryptohomeClient::DEVICE_KEY,
+      DEVICE_KEY,
       kEnterpriseMachineKey,
       base::Bind(DBusStringCallback,
                  base::Bind(&AttestationPolicyObserver::CheckCertificateExpiry,
                             weak_factory_.GetWeakPtr())));
 }
 
 void AttestationPolicyObserver::CheckCertificateExpiry(
     const std::string& certificate) {
   // TODO(dkrahn): Check if the certificate will expire soon, for now assume no.
   CheckIfUploaded(certificate);
 }
 
 void AttestationPolicyObserver::UploadCertificate(
     const std::string& certificate) {
   // TODO(dkrahn): Upload the certificate.
 }
 
 void AttestationPolicyObserver::CheckIfUploaded(
     const std::string& certificate) {
   // TODO(dkrahn): Check if we've already uploaded the certificate.
 }
 
 }  // namespace attestation
 }  // namespace chromeos