trunks: Fix generator bug in handle serialization

This CL fixes the MockTpm class definition after the recent fix to Tpm
generated code.

BUG=None
TEST=FEATURES=test emerge-rambi trunks

Change-Id: I0f327ea9cf17fdb5e5181970315889cd1c05e323

1 files changed, 16 insertions, 22 deletions

diff --git a/mock_tpm.h b/mock_tpm.h
index c2d4656..7dae456 100644
--- a/mock_tpm.h
+++ b/mock_tpm.h
@@ -171,18 +171,16 @@ class MockTpm : public Tpm {
              TPM_HANDLE* object_handle,
              TPM2B_NAME* name,
              AuthorizationDelegate* authorization_delegate));
-  MOCK_METHOD6(LoadExternal,
-      void(const TPMI_RH_HIERARCHY& hierarchy,
-           const std::string& hierarchy_name,
-           const TPM2B_SENSITIVE& in_private,
+  MOCK_METHOD5(LoadExternal,
+      void(const TPM2B_SENSITIVE& in_private,
            const TPM2B_PUBLIC& in_public,
+           const TPMI_RH_HIERARCHY& hierarchy,
            AuthorizationDelegate* authorization_delegate,
            const LoadExternalResponse& callback));
-  MOCK_METHOD7(LoadExternalSync,
-      TPM_RC(const TPMI_RH_HIERARCHY& hierarchy,
-             const std::string& hierarchy_name,
-             const TPM2B_SENSITIVE& in_private,
+  MOCK_METHOD6(LoadExternalSync,
+      TPM_RC(const TPM2B_SENSITIVE& in_private,
              const TPM2B_PUBLIC& in_public,
+             const TPMI_RH_HIERARCHY& hierarchy,
              TPM_HANDLE* object_handle,
              TPM2B_NAME* name,
              AuthorizationDelegate* authorization_delegate));
@@ -419,18 +417,16 @@ class MockTpm : public Tpm {
              TPM2B_MAX_BUFFER* out_data,
              TPM2B_IV* iv_out,
              AuthorizationDelegate* authorization_delegate));
-  MOCK_METHOD6(Hash,
-      void(const TPMI_RH_HIERARCHY& hierarchy,
-           const std::string& hierarchy_name,
-           const TPM2B_MAX_BUFFER& data,
+  MOCK_METHOD5(Hash,
+      void(const TPM2B_MAX_BUFFER& data,
            const TPMI_ALG_HASH& hash_alg,
+           const TPMI_RH_HIERARCHY& hierarchy,
            AuthorizationDelegate* authorization_delegate,
            const HashResponse& callback));
-  MOCK_METHOD7(HashSync,
-      TPM_RC(const TPMI_RH_HIERARCHY& hierarchy,
-             const std::string& hierarchy_name,
-             const TPM2B_MAX_BUFFER& data,
+  MOCK_METHOD6(HashSync,
+      TPM_RC(const TPM2B_MAX_BUFFER& data,
              const TPMI_ALG_HASH& hash_alg,
+             const TPMI_RH_HIERARCHY& hierarchy,
              TPM2B_DIGEST* out_hash,
              TPMT_TK_HASHCHECK* validation,
              AuthorizationDelegate* authorization_delegate));
@@ -498,20 +494,18 @@ class MockTpm : public Tpm {
              const std::string& sequence_handle_name,
              const TPM2B_MAX_BUFFER& buffer,
              AuthorizationDelegate* authorization_delegate));
-  MOCK_METHOD7(SequenceComplete,
+  MOCK_METHOD6(SequenceComplete,
       void(const TPMI_DH_OBJECT& sequence_handle,
            const std::string& sequence_handle_name,
-           const TPMI_RH_HIERARCHY& hierarchy,
-           const std::string& hierarchy_name,
            const TPM2B_MAX_BUFFER& buffer,
+           const TPMI_RH_HIERARCHY& hierarchy,
            AuthorizationDelegate* authorization_delegate,
            const SequenceCompleteResponse& callback));
-  MOCK_METHOD8(SequenceCompleteSync,
+  MOCK_METHOD7(SequenceCompleteSync,
       TPM_RC(const TPMI_DH_OBJECT& sequence_handle,
              const std::string& sequence_handle_name,
-             const TPMI_RH_HIERARCHY& hierarchy,
-             const std::string& hierarchy_name,
              const TPM2B_MAX_BUFFER& buffer,
+             const TPMI_RH_HIERARCHY& hierarchy,
              TPM2B_DIGEST* result,
              TPMT_TK_HASHCHECK* validation,
              AuthorizationDelegate* authorization_delegate));