| Index: service.h
 | 
| diff --git a/service.h b/service.h
 | 
| index 1fa6fead4d0f2c9bec55afc1869d34b1fdc653bb..7dec627bd95583ae82ffc7209741a97958108e38 100644
 | 
| --- a/service.h
 | 
| +++ b/service.h
 | 
| @@ -17,6 +17,7 @@
 | 
|  #include "cryptohome_event_source.h"
 | 
|  #include "mount.h"
 | 
|  #include "mount_task.h"
 | 
| +#include "pkcs11_init.h"
 | 
|  #include "tpm_init.h"
 | 
|  
 | 
|  namespace cryptohome {
 | 
| @@ -147,6 +148,15 @@ class Service : public chromeos::dbus::AbstractDbusService,
 | 
|    virtual gboolean TpmIsBeingOwned(gboolean* OUT_owning, GError** error);
 | 
|    virtual gboolean TpmCanAttemptOwnership(GError** error);
 | 
|    virtual gboolean TpmClearStoredPassword(GError** error);
 | 
| +
 | 
| +  // Returns the label of the TPM token along with its SO and user PINs.
 | 
| +  virtual gboolean Pkcs11GetTpmTokenInfo(gchar** OUT_label,
 | 
| +                                         gchar** OUT_so_pin,
 | 
| +                                         gchar** OUT_user_pin,
 | 
| +                                         GError** error);
 | 
| +
 | 
| +  // Returns in |OUT_ready| whether the TPM token is ready for use.
 | 
| +  virtual gboolean Pkcs11IsReady(gboolean* OUT_ready, GError** error);
 | 
|    virtual gboolean GetStatusString(gchar** OUT_status, GError** error);
 | 
|  
 | 
|   protected:
 | 
| @@ -165,6 +175,8 @@ class Service : public chromeos::dbus::AbstractDbusService,
 | 
|    cryptohome::Mount* mount_;
 | 
|    scoped_ptr<TpmInit> default_tpm_init_;
 | 
|    TpmInit *tpm_init_;
 | 
| +  scoped_ptr<Pkcs11Init> default_pkcs11_init_;
 | 
| +  Pkcs11Init *pkcs11_init_;
 | 
|    bool initialize_tpm_;
 | 
|    base::Thread mount_thread_;
 | 
|    guint async_complete_signal_;
 | 
| 
 |