Add support for the Pkcs11GetTpmTokenInfoForUser cryptohome call.

chromeos/dbus/cryptohome_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
 #define CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 21 matching lines @@
   typedef base::Callback<void(int async_id,
                               bool return_status,
                               const std::string& data)>
       AsyncCallStatusWithDataHandler;
   // A callback to handle responses of AsyncXXX methods.
   typedef base::Callback<void(int async_id)> AsyncMethodCallback;
   // A callback to handle responses of Pkcs11GetTpmTokenInfo method.
   typedef base::Callback<void(
       DBusMethodCallStatus call_status,
       const std::string& label,
-      const std::string& user_pin)> Pkcs11GetTpmTokenInfoCallback;
+      const std::string& user_pin,
+      int slot)> Pkcs11GetTpmTokenInfoCallback;

[satorux1, 2013/10/08 04:29:33]

What is slot? could you add some comments about label, user_bin, and slot while
you are at it?

[Darren Krahn, 2013/10/08 17:06:41]

Done.

   // A callback for methods which return both a bool result and data.
   typedef base::Callback<void(DBusMethodCallStatus call_status,
                               bool result,
                               const std::string& data)> DataMethodCallback;
 
   virtual ~CryptohomeClient();
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static CryptohomeClient* Create(DBusClientImplementationType type);
@@ skipping 130 matching lines @@
   virtual bool CallTpmClearStoredPasswordAndBlock() = 0;
 
   // Calls Pkcs11IsTpmTokenReady method.
   virtual void Pkcs11IsTpmTokenReady(
       const BoolDBusMethodCallback& callback) = 0;
 
   // Calls Pkcs11GetTpmTokenInfo method.
   virtual void Pkcs11GetTpmTokenInfo(
       const Pkcs11GetTpmTokenInfoCallback& callback) = 0;
 
+  virtual void Pkcs11GetTpmTokenInfoForUser(

[satorux1, 2013/10/08 04:29:33]

Function comment is missing.  "Calls XXX method." is not particularly useful,
but might be better than nothing for consistency. :P 

I think it'd be nice to describe the difference between this function and
Pkcs11GetTpmTokenInfo, which looks very similar.

[Darren Krahn, 2013/10/08 17:06:41]

Done.

+      const std::string& username,
+      const Pkcs11GetTpmTokenInfoCallback& callback) = 0;
+
   // Calls InstallAttributesGet method and returns true when the call succeeds.
   // This method blocks until the call returns.
   // The original content of |value| is lost.
   virtual bool InstallAttributesGet(const std::string& name,
                                     std::vector<uint8>* value,
                                     bool* successful) = 0;
 
   // Calls InstallAttributesSet method and returns true when the call succeeds.
   // This method blocks until the call returns.
   virtual bool InstallAttributesSet(const std::string& name,
@@ skipping 154 matching lines @@
   // Create() should be used instead.
   CryptohomeClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CryptohomeClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_CRYPTOHOME_CLIENT_H_