Added an options parameter to TpmAttestationSignEnterpriseChallenge.

chromeos/cryptohome/mock_async_method_caller.h

 // 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.
 
 #ifndef CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
 #define CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 38 matching lines @@
                     const DataCallback& callback));
   MOCK_METHOD4(AsyncTpmAttestationFinishCertRequest,
                void(const std::string& pca_response,
                     chromeos::CryptohomeClient::AttestationKeyType key_type,
                     const std::string& key_name,
                     const DataCallback& callback));
   MOCK_METHOD3(TpmAttestationRegisterKey,
                void(chromeos::CryptohomeClient::AttestationKeyType key_type,
                     const std::string& key_name,
                     const Callback& callback));
-  MOCK_METHOD6(TpmAttestationSignEnterpriseChallenge,
-               void(chromeos::CryptohomeClient::AttestationKeyType key_type,
-                    const std::string& key_name,
-                    const std::string& domain,
-                    const std::string& device_id,
-                    const std::string& challenge,
-                    const DataCallback& callback));
+  MOCK_METHOD7(
+      TpmAttestationSignEnterpriseChallenge,
+      void(chromeos::CryptohomeClient::AttestationKeyType key_type,
+           const std::string& key_name,
+           const std::string& domain,
+           const std::string& device_id,
+           chromeos::CryptohomeClient::AttestationChallengeOptions options,
+           const std::string& challenge,
+           const DataCallback& callback));
   MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
                void(chromeos::CryptohomeClient::AttestationKeyType key_type,
                     const std::string& key_name,
                     const std::string& challenge,
                     const DataCallback& callback));
   MOCK_METHOD2(AsyncGetSanitizedUsername,
                void(const std::string& user,
                     const DataCallback& callback));
 
  private:
   bool success_;
   MountError return_code_;
 
   void DoCallback(Callback callback);
   // Default fakes for attestation calls.
   void FakeCreateEnrollRequest(const DataCallback& callback);
   void FakeCreateCertRequest(const DataCallback& callback);
   void FakeFinishCertRequest(const DataCallback& callback);
   void FakeGetSanitizedUsername(const DataCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(MockAsyncMethodCaller);
 };
 
 }  // namespace cryptohome
 
 #endif  // CHROMEOS_CRYPTOHOME_MOCK_ASYNC_METHOD_CALLER_H_