Added multi-profile support for attestation on chromeos.

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 dcd59a0d037294ae372595ae61d524dd377e5723..7f54164b6edeca8b9eb13e8b43e520dba4319b92 100644
--- a/chromeos/cryptohome/mock_async_method_caller.cc
+++ b/chromeos/cryptohome/mock_async_method_caller.cc
@@ -55,22 +55,22 @@ void MockAsyncMethodCaller::SetUp(bool success, MountError return_code) {
       .WillByDefault(
           WithArgs<3>(Invoke(this,
                              &MockAsyncMethodCaller::FakeCreateCertRequest)));
-  ON_CALL(*this, AsyncTpmAttestationFinishCertRequest(_, _, _, _))
+  ON_CALL(*this, AsyncTpmAttestationFinishCertRequest(_, _, _, _, _))
       .WillByDefault(
-          WithArgs<3>(Invoke(this,
+          WithArgs<4>(Invoke(this,
                              &MockAsyncMethodCaller::FakeFinishCertRequest)));
   ON_CALL(*this, AsyncGetSanitizedUsername(_, _))
       .WillByDefault(
           WithArgs<1>(Invoke(this,
                              &MockAsyncMethodCaller::
                                  FakeGetSanitizedUsername)));
-  ON_CALL(*this, TpmAttestationSignEnterpriseChallenge(_, _, _, _, _, _, _))
+  ON_CALL(*this, TpmAttestationSignEnterpriseChallenge(_, _, _, _, _, _, _, _))
       .WillByDefault(
-          WithArgs<6>(Invoke(this,
+          WithArgs<7>(Invoke(this,
                              &MockAsyncMethodCaller::FakeEnterpriseChallenge)));
-  ON_CALL(*this, TpmAttestationRegisterKey(_, _, _))
+  ON_CALL(*this, TpmAttestationRegisterKey(_, _, _, _))
       .WillByDefault(
-          WithArgs<2>(Invoke(this, &MockAsyncMethodCaller::DoCallback)));
+          WithArgs<3>(Invoke(this, &MockAsyncMethodCaller::DoCallback)));
 }
 
 void MockAsyncMethodCaller::DoCallback(Callback callback) {