Remove GetPkcs11Id from x509_certificate_model

chrome/browser/chromeos/options/cert_library.h

Index: chrome/browser/chromeos/options/cert_library.h
diff --git a/chrome/browser/chromeos/options/cert_library.h b/chrome/browser/chromeos/options/cert_library.h
index 9bbfb77072dd5a47ebbd51cc7bc7e6d41bb59e9b..eb9b7e538523f7587bb4237e6c1e116cbf79ca4c 100644
--- a/chrome/browser/chromeos/options/cert_library.h
+++ b/chrome/browser/chromeos/options/cert_library.h
@@ -68,8 +68,8 @@ class CertLibrary : public CertLoader::Observer {
 
   // Retreives the certificate property for |type| at |index|.
   base::string16 GetCertDisplayStringAt(CertType type, int index) const;
-  std::string GetCertPEMAt(CertType type, int index) const;
-  std::string GetCertPkcs11IdAt(CertType type, int index) const;
+  std::string GetServerCACertPEMAt(int index) const;
+  std::string GetUserCertPkcs11IdAt(int index) const;
   bool IsCertHardwareBackedAt(CertType type, int index) const;
 
   // Returns the index of a Certificate matching |pem_encoded| or -1 if none
@@ -77,10 +77,9 @@ class CertLibrary : public CertLoader::Observer {
   // certificates.
   // TOOD(pneubeck): Either make this more efficient, asynchronous or get rid of
   // it.
-  int GetCertIndexByPEM(CertType type, const std::string& pem_encoded) const;
-  // Same as above but for a PKCS#11 id. TODO(stevenjb): Replace this with a
-  // better mechanism for uniquely idientifying certificates, crbug.com/236978.
-  int GetCertIndexByPkcs11Id(CertType type, const std::string& pkcs11_id) const;
+  int GetServerCACertIndexByPEM(const std::string& pem_encoded) const;
+  // Same as above but for a PKCS#11 id.
+  int GetUserCertIndexByPkcs11Id(const std::string& pkcs11_id) const;
 
   // CertLoader::Observer
   virtual void OnCertificatesLoaded(const net::CertificateList&,