Enhanced and refactored the AttestationFlow interface.

chromeos/cryptohome/mock_async_method_caller.cc

Index: chromeos/cryptohome/mock_async_method_caller.cc
diff --git a/chromeos/cryptohome/mock_async_method_caller.cc b/chromeos/cryptohome/mock_async_method_caller.cc
index bf65376d2c7943a085f8bd6815006337fb755850..b22f780bf4041f871d5f2d4019fd5da649860e82 100644
--- a/chromeos/cryptohome/mock_async_method_caller.cc
+++ b/chromeos/cryptohome/mock_async_method_caller.cc
@@ -14,6 +14,8 @@ const char MockAsyncMethodCaller::kFakeAttestationEnrollRequest[] = "enrollreq";
 const char MockAsyncMethodCaller::kFakeAttestationCertRequest[] = "certreq";
 const char MockAsyncMethodCaller::kFakeAttestationCert[] = "cert";
 const char MockAsyncMethodCaller::kFakeSanitizedUsername[] = "01234567890ABC";
+const char MockAsyncMethodCaller::kFakeChallengeResponse[] =
+    "challenge_response";
 
 MockAsyncMethodCaller::MockAsyncMethodCaller()
     : success_(false), return_code_(cryptohome::MOUNT_ERROR_NONE) {
@@ -59,6 +61,13 @@ void MockAsyncMethodCaller::SetUp(bool success, MountError return_code) {
           WithArgs<1>(Invoke(this,
                              &MockAsyncMethodCaller::
                                  FakeGetSanitizedUsername)));
+  ON_CALL(*this, TpmAttestationSignEnterpriseChallenge(_, _, _, _, _, _, _))
+      .WillByDefault(
+          WithArgs<6>(Invoke(this,
+                             &MockAsyncMethodCaller::FakeEnterpriseChallenge)));
+  ON_CALL(*this, TpmAttestationRegisterKey(_, _, _))
+      .WillByDefault(
+          WithArgs<2>(Invoke(this, &MockAsyncMethodCaller::DoCallback)));
 }
 
 void MockAsyncMethodCaller::DoCallback(Callback callback) {
@@ -85,4 +94,9 @@ void MockAsyncMethodCaller::FakeGetSanitizedUsername(
   callback.Run(success_, kFakeSanitizedUsername);
 }
 
+void MockAsyncMethodCaller::FakeEnterpriseChallenge(
+    const DataCallback& callback) {
+  callback.Run(success_, kFakeChallengeResponse);
+}
+
 }  // namespace cryptohome