Add better handling of a TPM clear.

tpm.h

 // 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.
 
 // Tpm - class for handling init TPM initialization for Chrome OS
 
 #include <base/lock.h>
 #include <base/logging.h>
 #include <base/scoped_ptr.h>
 #include <chromeos/utility.h>
@@ skipping 51 matching lines @@
   bool IsOwned() const { return is_owned_; }
 
   // Returns whether or not the SRK is available
   bool IsSrkAvailable() const { return is_srk_available_; }
 
   // Returns whether or not the TPM is being owned
   bool IsBeingOwned() const { return is_being_owned_; }
 
   // Runs the TPM initialization sequence.  This may take a long time due to the
   // call to Tspi_TPM_TakeOwnership.
-  bool InitializeTpm();
+  bool InitializeTpm(bool* OUT_took_ownership);
 
   // Gets random bytes from the TPM
   //
   // Parameters
   //   length - The number of bytes to get
   //   data (OUT) - The random data from the TPM
   bool GetRandomData(size_t length, chromeos::Blob* data);
 
  private:
   // Attempts to connect to tcsd
@@ skipping 133 matching lines @@
 
   // Indicates if the TPM is being owned
   bool is_being_owned_;
 
   DISALLOW_COPY_AND_ASSIGN(Tpm);
 };
 
 }  // namespace tpm_init
 
 #endif  // TPM_INIT_TPM_H_