Separate cert loading code from CertLibrary and move to src/chromeos

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 "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 114 matching lines @@
   virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
   views::Combobox* eap_method_combobox_;
 
   DISALLOW_COPY_AND_ASSIGN(Phase2AuthComboboxModel);
 };
 
 class ServerCACertComboboxModel : public ui::ComboboxModel {
  public:
-  explicit ServerCACertComboboxModel(CertLibrary* cert_library);
+  ServerCACertComboboxModel();
   virtual ~ServerCACertComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
   virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
-  CertLibrary* cert_library_;
   DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
 };
 
 class UserCertComboboxModel : public ui::ComboboxModel {
  public:
-  explicit UserCertComboboxModel(CertLibrary* cert_library);
+  UserCertComboboxModel();
   virtual ~UserCertComboboxModel();
 
   // Overridden from ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
   virtual string16 GetItemAt(int index) OVERRIDE;
 
  private:
-  CertLibrary* cert_library_;
-
   DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
 };
 
 // SecurityComboboxModel -------------------------------------------------------
 
 SecurityComboboxModel::SecurityComboboxModel() {
 }
 
 SecurityComboboxModel::~SecurityComboboxModel() {
 }
@@ skipping 89 matching lines @@
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_PAP);
   else if (index == PHASE_2_AUTH_INDEX_CHAP)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PHASE_2_AUTH_CHAP);
   NOTREACHED();
   return string16();
 }
 
 // ServerCACertComboboxModel ---------------------------------------------------
 
-ServerCACertComboboxModel::ServerCACertComboboxModel(CertLibrary* cert_library)
-    : cert_library_(cert_library) {
-  DCHECK(cert_library);
+ServerCACertComboboxModel::ServerCACertComboboxModel() {
 }
 
 ServerCACertComboboxModel::~ServerCACertComboboxModel() {
 }
 
 int ServerCACertComboboxModel::GetItemCount() const {
-  if (cert_library_->CertificatesLoading())
+  if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
   // First "Default", then the certs, then "Do not check".
-  return cert_library_->GetCACertificates().Size() + 2;
+  return CertLibrary::Get()->NumCertificates(
+      CertLibrary::CERT_TYPE_SERVER_CA) + 2;
 }
 
 string16 ServerCACertComboboxModel::GetItemAt(int index) {
-  if (cert_library_->CertificatesLoading())
+  if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
   if (index == 0)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
   if (index == GetItemCount() - 1)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DO_NOT_CHECK);
   int cert_index = index - 1;
-  return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
+  return CertLibrary::Get()->GetCertDisplayStringAt(
+      CertLibrary::CERT_TYPE_SERVER_CA, cert_index);
 }
 
 // UserCertComboboxModel -------------------------------------------------------
 
-UserCertComboboxModel::UserCertComboboxModel(CertLibrary* cert_library)
-    : cert_library_(cert_library) {
-  DCHECK(cert_library);
+UserCertComboboxModel::UserCertComboboxModel() {
 }
 
 UserCertComboboxModel::~UserCertComboboxModel() {
 }
 
 int UserCertComboboxModel::GetItemCount() const {
-  if (cert_library_->CertificatesLoading())
+  if (CertLibrary::Get()->CertificatesLoading())
     return 1;  // "Loading"
-  int num_certs = cert_library_->GetUserCertificates().Size();
+  int num_certs =
+      CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER);
   if (num_certs == 0)
     return 1;  // "None installed"
   return num_certs;
 }
 
 string16 UserCertComboboxModel::GetItemAt(int index) {
-  if (cert_library_->CertificatesLoading())
+  if (CertLibrary::Get()->CertificatesLoading())
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
-  if (cert_library_->GetUserCertificates().Size() == 0)
+  if (CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER) == 0)
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
-  return cert_library_->GetUserCertificates().GetDisplayStringAt(index);
+  return CertLibrary::Get()->GetCertDisplayStringAt(
+      CertLibrary::CERT_TYPE_USER, index);
 }
 
 }  // namespace internal
 
 WifiConfigView::WifiConfigView(NetworkConfigView* parent, WifiNetwork* wifi)
     : ChildNetworkConfigView(parent, wifi),
-      cert_library_(NULL),
       ssid_textfield_(NULL),
       eap_method_combobox_(NULL),
       phase_2_auth_label_(NULL),
       phase_2_auth_combobox_(NULL),
       user_cert_label_(NULL),
       user_cert_combobox_(NULL),
       server_ca_cert_label_(NULL),
       server_ca_cert_combobox_(NULL),
       identity_label_(NULL),
       identity_textfield_(NULL),
       identity_anonymous_label_(NULL),
       identity_anonymous_textfield_(NULL),
       save_credentials_checkbox_(NULL),
       share_network_checkbox_(NULL),
       shared_network_label_(NULL),
       security_combobox_(NULL),
       passphrase_label_(NULL),
       passphrase_textfield_(NULL),
       passphrase_visible_button_(NULL),
       error_label_(NULL) {
   Init(wifi, Is8021x(wifi));
 }
 
 WifiConfigView::WifiConfigView(NetworkConfigView* parent, bool show_8021x)
     : ChildNetworkConfigView(parent),
-      cert_library_(NULL),
       ssid_textfield_(NULL),
       eap_method_combobox_(NULL),
       phase_2_auth_label_(NULL),
       phase_2_auth_combobox_(NULL),
       user_cert_label_(NULL),
       user_cert_combobox_(NULL),
       server_ca_cert_label_(NULL),
       server_ca_cert_combobox_(NULL),
       identity_label_(NULL),
       identity_textfield_(NULL),
       identity_anonymous_label_(NULL),
       identity_anonymous_textfield_(NULL),
       save_credentials_checkbox_(NULL),
       share_network_checkbox_(NULL),
       shared_network_label_(NULL),
       security_combobox_(NULL),
       passphrase_label_(NULL),
       passphrase_textfield_(NULL),
       passphrase_visible_button_(NULL),
       error_label_(NULL) {
   Init(NULL, show_8021x);
 }
 
 WifiConfigView::~WifiConfigView() {
-  if (cert_library_)
-    cert_library_->RemoveObserver(this);
+  CertLibrary::Get()->RemoveObserver(this);
 }
 
 views::View* WifiConfigView::GetInitiallyFocusedView() {
   // Return a reasonable widget for initial focus,
   // depending on what we're showing.
   if (ssid_textfield_)
     return ssid_textfield_;
   else if (eap_method_combobox_)
     return eap_method_combobox_;
   else if (passphrase_textfield_ && passphrase_textfield_->enabled())
@@ skipping 21 matching lines @@
     return false;
 
   // Block login if certs are required but user has none.
   if (UserCertRequired() && (!HaveUserCerts() || !IsUserCertValid()))
       return false;
 
   return true;
 }
 
 bool WifiConfigView::UserCertRequired() const {
-  if (!cert_library_)
-    return false;  // return false until cert_library_ is initialized.
   return UserCertActive();
 }
 
 bool WifiConfigView::HaveUserCerts() const {
-  return cert_library_->GetUserCertificates().Size() > 0;
+  return CertLibrary::Get()->NumCertificates(CertLibrary::CERT_TYPE_USER) > 0;
 }
 
 bool WifiConfigView::IsUserCertValid() const {
   if (!UserCertActive())
     return false;
   int index = user_cert_combobox_->selected_index();
   if (index < 0)
     return false;
   // Currently only hardware-backed user certificates are valid.
-  if (cert_library_->IsHardwareBacked() &&
-      !cert_library_->GetUserCertificates().IsHardwareBackedAt(index))
+  if (CertLibrary::Get()->IsHardwareBacked() &&
+      !CertLibrary::Get()->IsCertHardwareBackedAt(
+          CertLibrary::CERT_TYPE_USER, index))
     return false;
   return true;
 }
 
 bool WifiConfigView::Phase2AuthActive() const {
   if (phase_2_auth_combobox_)
     return phase_2_auth_combobox_->model()->GetItemCount() > 1;
   return false;
 }
 
@@ skipping 23 matching lines @@
     return index != EAP_METHOD_INDEX_NONE && index != EAP_METHOD_INDEX_LEAP;
   }
   return false;
 }
 
 void WifiConfigView::UpdateDialogButtons() {
   parent_->GetDialogClientView()->UpdateDialogButtons();
 }
 
 void WifiConfigView::RefreshEapFields() {
-  DCHECK(cert_library_);
-
   // If EAP method changes, the phase 2 auth choices may have changed also.
   phase_2_auth_combobox_->ModelChanged();
   phase_2_auth_combobox_->SetSelectedIndex(0);
   bool phase_2_auth_enabled = Phase2AuthActive();
   phase_2_auth_combobox_->SetEnabled(phase_2_auth_enabled &&
                                      phase_2_auth_ui_data_.editable());
   phase_2_auth_label_->SetEnabled(phase_2_auth_enabled);
 
   // Passphrase.
   bool passphrase_enabled = PassphraseActive();
   passphrase_textfield_->SetEnabled(passphrase_enabled &&
                                     passphrase_ui_data_.editable());
   passphrase_label_->SetEnabled(passphrase_enabled);
   if (!passphrase_enabled)
     passphrase_textfield_->SetText(string16());
 
   // User cert.
-  bool certs_loading = cert_library_->CertificatesLoading();
+  bool certs_loading = CertLibrary::Get()->CertificatesLoading();
   bool user_cert_enabled = UserCertActive();
   user_cert_label_->SetEnabled(user_cert_enabled);
   bool have_user_certs = !certs_loading && HaveUserCerts();
   user_cert_combobox_->SetEnabled(user_cert_enabled &&
                                   have_user_certs &&
                                   user_cert_ui_data_.editable());
   user_cert_combobox_->ModelChanged();
   user_cert_combobox_->SetSelectedIndex(0);
 
   // Server CA.
@@ skipping 36 matching lines @@
     share_network_checkbox_->SetEnabled(false);
     share_network_checkbox_->SetChecked(true);
   } else {
     share_network_checkbox_->SetEnabled(true);
     share_network_checkbox_->SetChecked(false);  // Default to unshared.
   }
 }
 
 void WifiConfigView::UpdateErrorLabel() {
   std::string error_msg;
-  if (UserCertRequired() && cert_library_->CertificatesLoaded()) {
+  if (UserCertRequired() && CertLibrary::Get()->CertificatesLoaded()) {
     if (!HaveUserCerts()) {
       if (!LoginState::Get()->IsUserLoggedIn()) {
         error_msg = l10n_util::GetStringUTF8(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN_FOR_USER_CERT);
       } else {
         error_msg = l10n_util::GetStringUTF8(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT);
       }
     } else if (!IsUserCertValid()) {
       error_msg = l10n_util::GetStringUTF8(
@@ skipping 226 matching lines @@
       return EAP_PHASE_2_AUTH_PAP;
     case PHASE_2_AUTH_INDEX_CHAP:
       return EAP_PHASE_2_AUTH_CHAP;
     default:
       return EAP_PHASE_2_AUTH_AUTO;
   }
 }
 
 std::string WifiConfigView::GetEapServerCaCertNssNickname() const {
   DCHECK(server_ca_cert_combobox_);
-  DCHECK(cert_library_);
   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 {
-    DCHECK(cert_library_);
     int cert_index = index - 1;
-    return cert_library_->GetCACertificates().GetNicknameAt(cert_index);
+    return CertLibrary::Get()->GetCertNicknameAt(
+        CertLibrary::CERT_TYPE_SERVER_CA, 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::GetEapClientCertPkcs11Id() const {
   DCHECK(user_cert_combobox_);
-  DCHECK(cert_library_);
   if (!HaveUserCerts()) {
     return std::string();  // "None installed"
   } else {
     // Certificates are listed in the order they appear in the model.
     int index = user_cert_combobox_->selected_index();
-    return cert_library_->GetUserCertificates().GetPkcs11IdAt(index);
+    return CertLibrary::Get()->GetCertPkcs11IdAt(
+        CertLibrary::CERT_TYPE_USER, index);
   }
 }
 
 std::string WifiConfigView::GetEapIdentity() const {
   DCHECK(identity_textfield_);
   return UTF16ToUTF8(identity_textfield_->text());
 }
 
 std::string WifiConfigView::GetEapAnonymousIdentity() const {
   DCHECK(identity_anonymous_textfield_);
@@ skipping 85 matching lines @@
     security_combobox_model_.reset(new internal::SecurityComboboxModel);
     security_combobox_ = new views::Combobox(security_combobox_model_.get());
     security_combobox_->SetAccessibleName(label_text);
     security_combobox_->set_listener(this);
     layout->AddView(security_combobox_);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   // Only enumerate certificates in the data model for 802.1X networks.
   if (show_8021x) {
-    // Initialize cert_library_ for 802.1X netoworks.
-    cert_library_ = chromeos::CrosLibrary::Get()->GetCertLibrary();
     // Setup a callback if certificates are yet to be loaded,
-    if (!cert_library_->CertificatesLoaded())
-      cert_library_->AddObserver(this);
+    if (!CertLibrary::Get()->CertificatesLoaded())

[pneubeck (no reviews), 2013/05/03 09:42:54]

same comment as for vpn config...

[stevenjb, 2013/05/03 17:02:32]

Done.

+      CertLibrary::Get()->AddObserver(this);
 
     // EAP method
     layout->StartRow(0, column_view_set_id);
     string16 eap_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_EAP_METHOD);
     layout->AddView(new views::Label(eap_label_text));
     eap_method_combobox_model_.reset(new internal::EAPMethodComboboxModel);
     eap_method_combobox_ = new views::Combobox(
         eap_method_combobox_model_.get());
     eap_method_combobox_->SetAccessibleName(eap_label_text);
@@ skipping 21 matching lines @@
     layout->AddView(new ControlledSettingIndicatorView(phase_2_auth_ui_data_));
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
     // Server CA certificate
     layout->StartRow(0, column_view_set_id);
     string16 server_ca_cert_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA);
     server_ca_cert_label_ = new views::Label(server_ca_cert_label_text);
     layout->AddView(server_ca_cert_label_);
     server_ca_cert_combobox_model_.reset(
-        new internal::ServerCACertComboboxModel(cert_library_));
+        new internal::ServerCACertComboboxModel());
     server_ca_cert_combobox_ = new ComboboxWithWidth(
         server_ca_cert_combobox_model_.get(),
         ChildNetworkConfigView::kInputFieldMinWidth);
     server_ca_cert_combobox_->SetAccessibleName(server_ca_cert_label_text);
     server_ca_cert_label_->SetEnabled(false);
     server_ca_cert_combobox_->SetEnabled(false);
     server_ca_cert_combobox_->set_listener(this);
     layout->AddView(server_ca_cert_combobox_);
     layout->AddView(
         new ControlledSettingIndicatorView(server_ca_cert_ui_data_));
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
     // User certificate
     layout->StartRow(0, column_view_set_id);
     string16 user_cert_label_text = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT);
     user_cert_label_ = new views::Label(user_cert_label_text);
     layout->AddView(user_cert_label_);
-    user_cert_combobox_model_.reset(
-        new internal::UserCertComboboxModel(cert_library_));
+    user_cert_combobox_model_.reset(new internal::UserCertComboboxModel());
     user_cert_combobox_ = new views::Combobox(user_cert_combobox_model_.get());
     user_cert_combobox_->SetAccessibleName(user_cert_label_text);
     user_cert_label_->SetEnabled(false);
     user_cert_combobox_->SetEnabled(false);
     user_cert_combobox_->set_listener(this);
     layout->AddView(user_cert_combobox_);
     layout->AddView(new ControlledSettingIndicatorView(user_cert_ui_data_));
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
     // Identity
@@ skipping 184 matching lines @@
         if (wifi->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 =
-            cert_library_->GetCACertificates().FindCertByNickname(nss_nickname);
+        int cert_index = CertLibrary::Get()->GetCertIndexByNickname(
+            CertLibrary::CERT_TYPE_SERVER_CA, nss_nickname);
         if (cert_index >= 0) {
           // Skip item for "Default".
           server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
         }
       }
     }
 
     // User certificate.
     if (UserCertActive()) {
       const std::string& pkcs11_id =
           (wifi ? wifi->eap_client_cert_pkcs11_id() : std::string());
       if (!pkcs11_id.empty()) {
-        int cert_index =
-            cert_library_->GetUserCertificates().FindCertByPkcs11Id(pkcs11_id);
+        int cert_index = CertLibrary::Get()->GetCertIndexByPkcs11Id(
+            CertLibrary::CERT_TYPE_USER, pkcs11_id);
         if (cert_index >= 0) {
           user_cert_combobox_->SetSelectedIndex(cert_index);
         }
       }
     }
 
     // Identity is always active.
     const std::string& eap_identity =
         (wifi ? wifi->eap_identity() : std::string());
     identity_textfield_->SetText(UTF8ToUTF16(eap_identity));
@@ skipping 36 matching lines @@
 void WifiConfigView::ParseWiFiEAPUIProperty(
     NetworkPropertyUIData* property_ui_data,
     Network* network,
     const std::string& key) {
   ParseWiFiUIProperty(
       property_ui_data, network,
       base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
 }
 
 }  // namespace chromeos