Don't use nss_util in CertificateManagerModel::IsHardwareBacked.

chrome/browser/certificate_manager_model.cc

Index: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index 57f0b1913f8d24e72272d42a9436d89a8fc45828..1b66deeb80f173e349e9bf6e4a9d01a9a9fce55c 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -10,17 +10,11 @@
 #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()),
@@ -81,7 +75,6 @@ string16 CertificateManagerModel::GetColumnText(
       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(
@@ -89,7 +82,6 @@ string16 CertificateManagerModel::GetColumnText(
             rv,
             l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED));
       }
-#endif
       break;
     case COL_CERTIFICATE_STORE:
       rv = UTF8ToUTF16(
@@ -157,11 +149,5 @@ bool CertificateManagerModel::Delete(net::X509Certificate* cert) {
 
 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);
 }