Don't use nss_util in CertificateManagerModel::IsHardwareBacked.

chrome/browser/certificate_manager_model.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/certificate_manager_model.h"
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #include "chrome/common/net/x509_certificate_model.h"
+#include "grit/generated_resources.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
-
-#if defined(OS_CHROMEOS)
-#include <cert.h>
-
-#include "crypto/nss_util.h"
-#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#endif
 
 CertificateManagerModel::CertificateManagerModel(Observer* observer)
     : cert_db_(net::NSSCertDatabase::GetInstance()),
       observer_(observer) {
 }
 
 CertificateManagerModel::~CertificateManagerModel() {
 }
 
 void CertificateManagerModel::Refresh() {
@@ skipping 40 matching lines @@
 
 string16 CertificateManagerModel::GetColumnText(
     const net::X509Certificate& cert,
     Column column) const {
   string16 rv;
   switch (column) {
     case COL_SUBJECT_NAME:
       rv = UTF8ToUTF16(
           x509_certificate_model::GetCertNameOrNickname(cert.os_cert_handle()));
 
-#if defined(OS_CHROMEOS)
       // TODO(xiyuan): Put this into a column when we have js tree-table.
       if (IsHardwareBacked(&cert)) {
         rv = l10n_util::GetStringFUTF16(
             IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT,
             rv,
             l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED));
       }
-#endif
       break;
     case COL_CERTIFICATE_STORE:
       rv = UTF8ToUTF16(
           x509_certificate_model::GetTokenName(cert.os_cert_handle()));
       break;
     case COL_SERIAL_NUMBER:
       rv = ASCIIToUTF16(x509_certificate_model::GetSerialNumberHexified(
           cert.os_cert_handle(), std::string()));
       break;
     case COL_EXPIRES_ON:
@@ skipping 47 matching lines @@
 
 bool CertificateManagerModel::Delete(net::X509Certificate* cert) {
   bool result = cert_db_->DeleteCertAndKey(cert);
   if (result)
     Refresh();
   return result;
 }
 
 bool CertificateManagerModel::IsHardwareBacked(
     const net::X509Certificate* cert) const {
-#if defined(OS_CHROMEOS)
-  return crypto::IsTPMTokenReady() &&
-         cert->os_cert_handle()->slot ==
-             cert_db_->GetPrivateModule()->os_module_handle();
-#else
-  return false;
-#endif
+  return cert_db_->IsHardwareBacked(cert);
 }