Enhanced and refactored the AttestationFlow interface.

chromeos/cryptohome/async_method_caller.cc

 // 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.
 
 #include "chromeos/cryptohome/async_method_caller.h"
 
 #include "base/bind.h"
 #include "base/hash_tables.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
@@ skipping 105 matching lines @@
         AsyncTpmAttestationCreateCertRequest(
             options,
             base::Bind(&AsyncMethodCallerImpl::RegisterAsyncDataCallback,
                        weak_ptr_factory_.GetWeakPtr(),
                        callback,
                        "Couldn't initiate async attestation cert request."));
   }
 
   virtual void AsyncTpmAttestationFinishCertRequest(
       const std::string& pca_response,
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const DataCallback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         AsyncTpmAttestationFinishCertRequest(
             pca_response,
             key_type,
             key_name,
             base::Bind(
                 &AsyncMethodCallerImpl::RegisterAsyncDataCallback,
                 weak_ptr_factory_.GetWeakPtr(),
                 callback,
                 "Couldn't initiate async attestation finish cert request."));
   }
 
   virtual void TpmAttestationRegisterKey(
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const Callback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         TpmAttestationRegisterKey(
             key_type,
             key_name,
             base::Bind(
                 &AsyncMethodCallerImpl::RegisterAsyncCallback,
                 weak_ptr_factory_.GetWeakPtr(),
                 callback,
                 "Couldn't initiate async attestation register key."));
   }
 
   virtual void TpmAttestationSignEnterpriseChallenge(
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& domain,
       const std::string& device_id,
-      chromeos::CryptohomeClient::AttestationChallengeOptions options,
+      chromeos::attestation::AttestationChallengeOptions options,
       const std::string& challenge,
       const DataCallback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         TpmAttestationSignEnterpriseChallenge(
             key_type,
             key_name,
             domain,
             device_id,
             options,
             challenge,
             base::Bind(
                 &AsyncMethodCallerImpl::RegisterAsyncDataCallback,
                 weak_ptr_factory_.GetWeakPtr(),
                 callback,
                 "Couldn't initiate async attestation enterprise challenge."));
   }
 
   virtual void TpmAttestationSignSimpleChallenge(
-      chromeos::CryptohomeClient::AttestationKeyType key_type,
+      chromeos::attestation::AttestationKeyType key_type,
       const std::string& key_name,
       const std::string& challenge,
       const DataCallback& callback) OVERRIDE {
     DBusThreadManager::Get()->GetCryptohomeClient()->
         TpmAttestationSignSimpleChallenge(
             key_type,
             key_name,
             challenge,
             base::Bind(
                 &AsyncMethodCallerImpl::RegisterAsyncDataCallback,
@@ skipping 147 matching lines @@
   g_async_method_caller = NULL;
   VLOG(1) << "AsyncMethodCaller Shutdown completed";
 }
 
 // static
 AsyncMethodCaller* AsyncMethodCaller::GetInstance() {
   return g_async_method_caller;
 }
 
 }  // namespace cryptohome