Fixing a problem introduced when "Unknown" certs were renamed

chrome/browser/ui/webui/options/certificate_manager_handler.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/ui/webui/options/certificate_manager_handler.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 294 matching lines @@
   RegisterTitle(localized_strings, "certificateManagerPage",
                 IDS_CERTIFICATE_MANAGER_TITLE);
 
   // Tabs.
   localized_strings->SetString("personalCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PERSONAL_CERTS_TAB_LABEL));
   localized_strings->SetString("serverCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_SERVER_CERTS_TAB_LABEL));
   localized_strings->SetString("caCertsTabTitle",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_CERT_AUTHORITIES_TAB_LABEL));
-  localized_strings->SetString("unknownCertsTabTitle",
-      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_UNKNOWN_TAB_LABEL));
+  localized_strings->SetString("otherCertsTabTitle",
+      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_OTHER_TAB_LABEL));
 
   // Tab descriptions.
   localized_strings->SetString("personalCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_USER_TREE_DESCRIPTION));
   localized_strings->SetString("serverCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_SERVER_TREE_DESCRIPTION));
   localized_strings->SetString("caCertsTabDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_AUTHORITIES_TREE_DESCRIPTION));
-  localized_strings->SetString("unknownCertsTabDescription",
-      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_UNKNOWN_TREE_DESCRIPTION));
+  localized_strings->SetString("otherCertsTabDescription",
+      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_OTHER_TREE_DESCRIPTION));
 
   // Buttons.
   localized_strings->SetString("view_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_VIEW_CERT_BUTTON));
   localized_strings->SetString("import_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_BUTTON));
   localized_strings->SetString("export_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_BUTTON));
   localized_strings->SetString("edit_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_BUTTON));
   localized_strings->SetString("delete_certificate",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_BUTTON));
 
   // Certificate Delete overlay strings.
   localized_strings->SetString("personalCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_USER_FORMAT));
   localized_strings->SetString("personalCertsTabDeleteImpact",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_USER_DESCRIPTION));
   localized_strings->SetString("serverCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_SERVER_FORMAT));
   localized_strings->SetString("serverCertsTabDeleteImpact",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_SERVER_DESCRIPTION));
   localized_strings->SetString("caCertsTabDeleteConfirm",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_CA_FORMAT));
   localized_strings->SetString("caCertsTabDeleteImpact",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_CA_DESCRIPTION));
-  localized_strings->SetString("unknownCertsTabDeleteConfirm",
-      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_UNKNOWN_FORMAT));
-  localized_strings->SetString("unknownCertsTabDeleteImpact", std::string());
+  localized_strings->SetString("otherCertsTabDeleteConfirm",
+      l10n_util::GetStringUTF16(IDS_CERT_MANAGER_DELETE_OTHER_FORMAT));
+  localized_strings->SetString("otherCertsTabDeleteImpact", std::string());
 
   // Certificate Restore overlay strings.
   localized_strings->SetString("certificateRestorePasswordDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_RESTORE_PASSWORD_DESC));
   localized_strings->SetString("certificatePasswordLabel",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PASSWORD_LABEL));
 
   // Personal Certificate Export overlay strings.
   localized_strings->SetString("certificateExportPasswordDescription",
       l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_PASSWORD_DESC));
@@ skipping 124 matching lines @@
 void CertificateManagerHandler::CertificatesRefreshed() {
   net::CertificateList web_trusted_certs;
 #if defined(OS_CHROMEOS)
   policy::ProfilePolicyConnectorFactory::GetForProfile(
       Profile::FromWebUI(web_ui()))->GetWebTrustedCertificates(
           &web_trusted_certs);
 #endif
   PopulateTree("personalCertsTab", net::USER_CERT, web_trusted_certs);
   PopulateTree("serverCertsTab", net::SERVER_CERT, web_trusted_certs);
   PopulateTree("caCertsTab", net::CA_CERT, web_trusted_certs);
-  PopulateTree("otherCertsTab", net::UNKNOWN_CERT, web_trusted_certs);
+  PopulateTree("otherCertsTab", net::OTHER_CERT, web_trusted_certs);
 }
 
 void CertificateManagerHandler::FileSelected(const base::FilePath& path,
                                              int index,
                                              void* params) {
   switch (reinterpret_cast<intptr_t>(params)) {
     case EXPORT_PERSONAL_FILE_SELECTED:
       ExportPersonalFileSelected(path);
       break;
     case IMPORT_PERSONAL_FILE_SELECTED:
@@ skipping 607 matching lines @@
   web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
                                    ready);
 }
 #endif
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
 }
 
 }  // namespace options