tpm_manager: Move Tpm1.2 context connection to its own class

TpmStatusImpl and TpmInitializerImpl both need to connect to the Tpm
using Trousers. This code is now abstracted out into a TpmConnection
class.

BUG=chromium:521635
TEST=tpm_manager_client --status on a DUT with Tpm1.2

Change-Id: Ie1eda50fddfc6354fd8bfd43965f044d52f9d1fd
Reviewed-on: https://chromium-review.googlesource.com/296431
Commit-Ready: Utkarsh Sanghi <usanghi@chromium.org>
Tested-by: Utkarsh Sanghi <usanghi@chromium.org>
Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/server/tpm_status_impl.h b/server/tpm_status_impl.h
index ca38342..cbc3c88 100644
--- a/server/tpm_status_impl.h
+++ b/server/tpm_status_impl.h
@@ -7,13 +7,15 @@
 
 #include "tpm_manager/server/tpm_status.h"
 
+#include <memory>
 #include <string>
 
 #include <base/macros.h>
-#include <trousers/scoped_tss_type.h>
 #include <trousers/tss.h>
 #include <trousers/trousers.h>  // NOLINT(build/include_alpha)
 
+#include <tpm_manager/server/tpm_connection.h>
+
 namespace tpm_manager {
 
 class TpmStatusImpl : public TpmStatus {
@@ -40,12 +42,8 @@ class TpmStatusImpl : public TpmStatus {
                      uint32_t sub_capability,
                      std::string* data,
                      TSS_RESULT* tpm_result);
-  // This method tries to get a handle to the TPM. Returns 0 on failure.
-  TSS_HTPM GetTpm();
-  // This method connects to the Tpm. Returns true on success.
-  bool ConnectContext();
 
-  trousers::ScopedTssContext context_;
+  TpmConnection tpm_connection_;
   bool is_enabled_{false};
   bool is_owned_{false};
   bool is_enable_initialized_{false};