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..b5370d3ccd3d423ec44a058eeafed2f116126dbc 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,10 @@ std::string CertificateViewerModalDialog::GetDialogArgs() const {
 
   // Get the certificate chain.
   net::X509Certificate::OSCertHandles cert_chain;
-  x509_certificate_model::GetCertChainFromCert(cert_hnd, &cert_chain);
+  cert_chain.push_back(cert_->os_cert_handle());

[msw, 2014/07/11 17:25:40]

Why can't you use cert_chain_ here?

[mattm, 2014/07/11 22:21:57]

cert_chain_ is a member of CertificateViewerDialogHandler, this is
CertificateViewerModalDialog.

+  const net::X509Certificate::OSCertHandles& certs =
+      cert_->GetIntermediateCertificates();
+  cert_chain.insert(cert_chain.end(), certs.begin(), certs.end());
 
   // Certificate usage.
   std::vector<std::string> usages;
@@ -251,9 +253,12 @@ 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_);
+    net::X509Certificate* cert)
+    : cert_(cert), dialog_(dialog) {
+  cert_chain_.push_back(cert_->os_cert_handle());

[msw, 2014/07/11 17:25:40]

If this logic is commonly needed (3rd time I see it), does keeping a helper make
sense? You could unify the helper implementations to work like this.

[mattm, 2014/07/11 22:21:57]

Done.

+  const net::X509Certificate::OSCertHandles& certs =
+      cert_->GetIntermediateCertificates();
+  cert_chain_.insert(cert_chain_.end(), certs.begin(), certs.end());
 }
 
 CertificateViewerDialogHandler::~CertificateViewerDialogHandler() {
@@ -278,7 +283,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(