Fix webui cert viewer showing wrong cert chain on NSS and no chain on OpenSSL.

chrome/browser/ui/webui/certificate_viewer_webui.cc

Index: chrome/browser/ui/webui/certificate_viewer_webui.cc
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc
index 4969b3e2ae8431acdc0df1abd4ae3cffae43f45d..10e77d80a10e3c1f90673af0aa25917fbdc3dc44 100644
--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc
+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -42,11 +42,10 @@ CertificateViewerModalDialog::CertificateViewerModalDialog(
     net::X509Certificate* cert)
     : cert_(cert), webui_(NULL), window_(NULL) {
   // Construct the dialog title from the certificate.
-  net::X509Certificate::OSCertHandles cert_chain;
-  x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
-      &cert_chain);
-  title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE,
-      base::UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
+  title_ = l10n_util::GetStringFUTF16(
+      IDS_CERT_INFO_DIALOG_TITLE,
+      base::UTF8ToUTF16(
+          x509_certificate_model::GetTitle(cert_->os_cert_handle())));
 }
 
 CertificateViewerModalDialog::~CertificateViewerModalDialog() {
@@ -103,7 +102,7 @@ std::string CertificateViewerModalDialog::GetDialogArgs() const {
 
   // Get the certificate chain.
   net::X509Certificate::OSCertHandles cert_chain;
-  x509_certificate_model::GetCertChainFromCert(cert_hnd, &cert_chain);
+  x509_certificate_model::GetCertChainFromCert(cert_, &cert_chain);
 
   // Certificate usage.
   std::vector<std::string> usages;
@@ -252,8 +251,7 @@ ui::ModalType CertificateViewerDialog::GetDialogModalType() const {
 CertificateViewerDialogHandler::CertificateViewerDialogHandler(
     CertificateViewerModalDialog* dialog,
     net::X509Certificate* cert) : cert_(cert), dialog_(dialog) {
-  x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
-      &cert_chain_);
+  x509_certificate_model::GetCertChainFromCert(cert_, &cert_chain_);

[Ryan Sleevi, 2014/07/10 02:50:18]

Do we really need this method any more? (the x509_certificate_model). Seems like
we should nuke it entirely in favour of using the net::X509Certificate

Also, git-cl-format this, lines 251-253 seem style-wrong.

[mattm, 2014/07/10 22:57:59]

Done.

 }
 
 CertificateViewerDialogHandler::~CertificateViewerDialogHandler() {
@@ -278,7 +276,8 @@ void CertificateViewerDialogHandler::ExportCertificate(
       platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog());
   ShowCertExportDialog(web_ui()->GetWebContents(),
                        window,
-                       cert_chain_[cert_index]);
+                       cert_chain_.begin() + cert_index,
+                       cert_chain_.end());
 }
 
 void CertificateViewerDialogHandler::RequestCertificateFields(