Remove GetPkcs11Id from x509_certificate_model

chrome/browser/chromeos/options/cert_library.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
@@ skipping 50 matching lines @@
   bool CertificatesLoaded() const;
 
   // Returns true if the TPM is available for hardware-backed certificates.
   bool IsHardwareBacked() const;
 
   // Retruns the number of certificates available for |type|.
   int NumCertificates(CertType type) const;
 
   // 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
   // found. This function may be slow depending on the number of stored
   // 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&,
                                     bool initial_load) OVERRIDE;
 
  private:
   CertLibrary();
   virtual ~CertLibrary();
 
   net::X509Certificate* GetCertificateAt(CertType type, int index) const;
   const net::CertificateList& GetCertificateListForType(CertType type) const;
 
   ObserverList<CertLibrary::Observer> observer_list_;
 
   // Sorted certificate lists
   net::CertificateList certs_;
   net::CertificateList user_certs_;
   net::CertificateList server_certs_;
   net::CertificateList server_ca_certs_;
 
   DISALLOW_COPY_AND_ASSIGN(CertLibrary);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_CERT_LIBRARY_H_