Use correct slot id for client certs in network config.

chrome/browser/chromeos/options/cert_library.cc

 // Copyright 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 "chrome/browser/chromeos/options/cert_library.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/i18n/string_compare.h"
@@ skipping 131 matching lines @@
 }
 
 bool CertLibrary::CertificatesLoaded() const {
   return CertLoader::Get()->certificates_loaded();
 }
 
 bool CertLibrary::IsHardwareBacked() const {
   return CertLoader::Get()->IsHardwareBacked();
 }
 
-std::string CertLibrary::GetTPMSlotID() const {
-  return base::IntToString(CertLoader::Get()->TPMTokenSlotID());
-}
-
 int CertLibrary::NumCertificates(CertType type) const {
   const net::CertificateList& cert_list = GetCertificateListForType(type);
   return static_cast<int>(cert_list.size());
 }
 
 base::string16 CertLibrary::GetCertDisplayStringAt(CertType type,
                                                    int index) const {
   net::X509Certificate* cert = GetCertificateAt(type, index);
   bool hardware_backed = IsCertHardwareBackedAt(type, index);
   return GetDisplayString(cert, hardware_backed);
 }
 
 std::string CertLibrary::GetServerCACertPEMAt(int index) const {
   return CertToPEM(*GetCertificateAt(CERT_TYPE_SERVER_CA, index));
 }
 
-std::string CertLibrary::GetUserCertPkcs11IdAt(int index) const {
+std::string CertLibrary::GetUserCertPkcs11IdAt(int index, int* slot_id) const {
   net::X509Certificate* cert = GetCertificateAt(CERT_TYPE_USER, index);
-  return CertLoader::GetPkcs11IdForCert(*cert);
+  return CertLoader::GetPkcs11IdAndSlotForCert(*cert, slot_id);
 }
 
 bool CertLibrary::IsCertHardwareBackedAt(CertType type, int index) const {
   net::X509Certificate* cert = GetCertificateAt(type, index);
   return CertLoader::Get()->IsCertificateHardwareBacked(cert);
 }
 
 int CertLibrary::GetServerCACertIndexByPEM(
     const std::string& pem_encoded) const {
   int num_certs = NumCertificates(CERT_TYPE_SERVER_CA);
   for (int index = 0; index < num_certs; ++index) {
     net::X509Certificate* cert = GetCertificateAt(CERT_TYPE_SERVER_CA, index);
     if (CertToPEM(*cert) != pem_encoded)
       continue;
     return index;
   }
   return -1;
 }
 
 int CertLibrary::GetUserCertIndexByPkcs11Id(
     const std::string& pkcs11_id) const {
   int num_certs = NumCertificates(CERT_TYPE_USER);
   for (int index = 0; index < num_certs; ++index) {
     net::X509Certificate* cert = GetCertificateAt(CERT_TYPE_USER, index);
-    std::string id = CertLoader::GetPkcs11IdForCert(*cert);
+    int slot_id = -1;
+    std::string id = CertLoader::GetPkcs11IdAndSlotForCert(*cert, &slot_id);
     if (id == pkcs11_id)
       return index;
   }
   return -1;  // Not found.
 }
 
 void CertLibrary::OnCertificatesLoaded(const net::CertificateList& cert_list,
                                        bool initial_load) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   VLOG(1) << "CertLibrary::OnCertificatesLoaded: " << cert_list.size();
@@ skipping 65 matching lines @@
     return user_certs_;
   if (type == CERT_TYPE_SERVER)
     return server_certs_;
   if (type == CERT_TYPE_SERVER_CA)
     return server_ca_certs_;
   DCHECK(type == CERT_TYPE_DEFAULT);
   return certs_;
 }
 
 }  // namespace chromeos