Add support for the Pkcs11GetTpmTokenInfoForUser cryptohome call.

chromeos/cert_loader.cc

 // Copyright (c) 2013 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.
 
 #include "chromeos/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/observer_list.h"
@@ skipping 279 matching lines @@
     RetryTokenInitializationLater();
     return;
   }
 
   tpm_token_state_ = TPM_TOKEN_READY;
   InitializeTokenAndLoadCertificates();
 }
 
 void CertLoader::OnPkcs11GetTpmTokenInfo(DBusMethodCallStatus call_status,
                                          const std::string& token_name,
-                                         const std::string& user_pin) {
+                                         const std::string& user_pin,
+                                         int token_slot) {
   VLOG(1) << "OnPkcs11GetTpmTokenInfo: " << token_name;
 
   if (call_status == DBUS_METHOD_CALL_FAILURE) {
     RetryTokenInitializationLater();
     return;
   }
 
   tpm_token_name_ = token_name;
-  // TODO(stevenjb): The network code expects a slot ID, not a label. See
-  // crbug.com/201101. For now, use a hard coded, well known slot instead.
-  const char kHardcodedTpmSlot[] = "0";
-  tpm_token_slot_ = kHardcodedTpmSlot;
+  tpm_token_slot_ = base::IntToString(token_slot);
   tpm_user_pin_ = user_pin;
   tpm_token_state_ = TPM_TOKEN_INFO_RECEIVED;
 
   InitializeTokenAndLoadCertificates();
 }
 
 void CertLoader::OnTPMTokenInitialized(bool success) {
   VLOG(1) << "OnTPMTokenInitialized: " << success;
   if (!success) {
     RetryTokenInitializationLater();
@@ skipping 67 matching lines @@
   VLOG(1) << "OnCertRemoved";
   LoadCertificates();
 }
 
 void CertLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeRequestCertificates();
 }
 
 }  // namespace chromeos