Remove GetPkcs11Id from x509_certificate_model

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2012 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/wifi_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 793 matching lines @@
   DCHECK(server_ca_cert_combobox_);
   int index = server_ca_cert_combobox_->selected_index();
   if (index == 0) {
     // First item is "Default".
     return std::string();
   } else if (index == server_ca_cert_combobox_->model()->GetItemCount() - 1) {
     // Last item is "Do not check".
     return std::string();
   } else {
     int cert_index = index - 1;
-    return CertLibrary::Get()->GetCertPEMAt(
-        CertLibrary::CERT_TYPE_SERVER_CA, cert_index);
+    return CertLibrary::Get()->GetServerCACertPEMAt(cert_index);
   }
 }
 
 bool WifiConfigView::GetEapUseSystemCas() const {
   DCHECK(server_ca_cert_combobox_);
   // Only use system CAs if the first item ("Default") is selected.
   return server_ca_cert_combobox_->selected_index() == 0;
 }
 
 std::string WifiConfigView::GetEapSubjectMatch() const {
   DCHECK(subject_match_textfield_);
   return base::UTF16ToUTF8(subject_match_textfield_->text());
 }
 
 std::string WifiConfigView::GetEapClientCertPkcs11Id() const {
   DCHECK(user_cert_combobox_);
   if (!HaveUserCerts() || !UserCertActive()) {
     return std::string();  // No certificate selected or not required.
   } else {
     // Certificates are listed in the order they appear in the model.
     int index = user_cert_combobox_->selected_index();
-    return CertLibrary::Get()->GetCertPkcs11IdAt(
-        CertLibrary::CERT_TYPE_USER, index);
+    return CertLibrary::Get()->GetUserCertPkcs11IdAt(index);
   }
 }
 
 std::string WifiConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
   return base::UTF16ToUTF8(identity_textfield_->text());
 }
 
 std::string WifiConfigView::GetEapAnonymousIdentity() const {
   DCHECK(identity_anonymous_textfield_);
@@ skipping 406 matching lines @@
       if (eap_use_system_cas) {
         // "Default"
         server_ca_cert_combobox_->SetSelectedIndex(0);
       } else {
         // "Do not check".
         server_ca_cert_combobox_->SetSelectedIndex(
             server_ca_cert_combobox_->model()->GetItemCount() - 1);
       }
     } else {
       // Select the certificate if available.
-      int cert_index = CertLibrary::Get()->GetCertIndexByPEM(
-          CertLibrary::CERT_TYPE_SERVER_CA, eap_ca_cert_pem);
+      int cert_index =
+          CertLibrary::Get()->GetServerCACertIndexByPEM(eap_ca_cert_pem);
       if (cert_index >= 0) {
         // Skip item for "Default".
         server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
       } else {
         // "Default"
         server_ca_cert_combobox_->SetSelectedIndex(0);
       }
     }
   }
 
   // User certificate.
   if (UserCertActive()) {
     std::string eap_cert_id;
     properties.GetStringWithoutPathExpansion(
         shill::kEapCertIdProperty, &eap_cert_id);
     if (!eap_cert_id.empty()) {
-      int cert_index = CertLibrary::Get()->GetCertIndexByPkcs11Id(
-          CertLibrary::CERT_TYPE_USER, eap_cert_id);
+      int cert_index =
+          CertLibrary::Get()->GetUserCertIndexByPkcs11Id(eap_cert_id);
       if (cert_index >= 0)
         user_cert_combobox_->SetSelectedIndex(cert_index);
     }
   }
 
   // Identity is always active.
   std::string eap_identity;
   properties.GetStringWithoutPathExpansion(
       shill::kEapIdentityProperty, &eap_identity);
   identity_textfield_->SetText(base::UTF8ToUTF16(eap_identity));
@@ skipping 54 matching lines @@
 void WifiConfigView::ParseWiFiEAPUIProperty(
     NetworkPropertyUIData* property_ui_data,
     const NetworkState* network,
     const std::string& key) {
   ParseWiFiUIProperty(
       property_ui_data, network,
       base::StringPrintf("%s.%s", ::onc::wifi::kEAP, key.c_str()));
 }
 
 }  // namespace chromeos