Commit the change that I forgot to commit.

tpm.cc

 // Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Contains the implementation of class Tpm
 
 #include "tpm.h"
 
 #include <base/file_util.h>
 #include <base/platform_thread.h>
@@ skipping 523 matching lines @@
                        default_owner_password)) {
       LOG(ERROR) << "Take Ownership failed";
       return false;
     }
 
     is_owned_ = true;
     took_ownership = true;
   }
 
   // Ensure the SRK is available
+  TSS_RESULT result;
   TSS_HKEY srk_handle;
   TSS_UUID SRK_UUID = TSS_UUID_SRK;
-  if ((result = Tspi_Context_LoadKeyByUUID(context_handle, TSS_PS_TYPE_SYSTEM,
+  if ((result = Tspi_Context_LoadKeyByUUID(context_handle_, TSS_PS_TYPE_SYSTEM,
                                            SRK_UUID, &srk_handle))) {
     is_srk_available_ = false;
   } else {
-    Tspi_Context_CloseObject(context_handle, srk_handle);
+    Tspi_Context_CloseObject(context_handle_, srk_handle);
     is_srk_available_ = true;
   }
 
   // If we can open the TPM with the default password, then we still need to
   // zero the SRK password and unrestrict it, then change the owner password.
   TSS_HTPM tpm_handle;
   if (GetTpmWithAuth(context_handle_, default_owner_password, &tpm_handle) &&
       TestTpmAuth(tpm_handle)) {
     if (!ZeroSrkPassword(context_handle_, default_owner_password)) {
       LOG(ERROR) << "Couldn't zero SRK password";
@@ skipping 17 matching lines @@
     owner_password_.assign(owner_password.begin(), owner_password.end());
     password_sync_lock_.Release();
 
     file_util::WriteFile(FilePath(kTpmOwnedFile), NULL, 0);
   }
 
  return took_ownership;
 }
 
 } // namespace tpm_init