Use correct slot id for client certs in network config.

chromeos/cert_loader.h

 // 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.
 
 #ifndef CHROMEOS_CERT_LOADER_H_
 #define CHROMEOS_CERT_LOADER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 40 matching lines @@
   // Destroys the global instance.
   static void Shutdown();
 
   // Gets the global instance. Initialize() must be called first.
   static CertLoader* Get();
 
   // Returns true if the global instance has been initialized.
   static bool IsInitialized();
 
   // Returns the PKCS#11 attribute CKA_ID for a certificate as an upper-case
-  // hex string, or the empty string if none is found. Note that the returned ID
-  // should be used only to identify the cert in its slot.
-  // This should be used only for user certificates, assuming that only one
-  // private slot is loaded for a user.
-  // TODO(tbarzic): Make this check cert slot id if we start loading
-  // certificates for secondary users.
-  static std::string GetPkcs11IdForCert(const net::X509Certificate& cert);
+  // hex string and sets |slot_id| to the id of the containing slot, or returns
+  // an empty string and doesn't modify |slot_id| if the PKCS#11 id could not be
+  // determined.
+  static std::string GetPkcs11IdAndSlotForCert(const net::X509Certificate& cert,
+                                               int* slot_id);
 
   // Starts the CertLoader with the NSS cert database.
   // The CertLoader will _not_ take the ownership of the database, but it
   // expects it to stay alive at least until the shutdown starts on the main
   // thread. This assumes that |StartWithNSSDB| and other methods directly
   // using |database_| are not called during shutdown.
   void StartWithNSSDB(net::NSSCertDatabase* database);
 
   void AddObserver(CertLoader::Observer* observer);
   void RemoveObserver(CertLoader::Observer* observer);
 
-  int TPMTokenSlotID() const;
   bool IsHardwareBacked() const;
 
   // Whether the certificate is hardware backed. Returns false if the CertLoader
   // was not yet started (both |CertificatesLoading()| and
   // |certificates_loaded()| are false).
   bool IsCertificateHardwareBacked(const net::X509Certificate* cert) const;
 
   // Returns true when the certificate list has been requested but not loaded.
   bool CertificatesLoading() const;
 
@@ skipping 44 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<CertLoader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CertLoader);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_CERT_LOADER_H_