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

net/cert/cert_verify_proc_android.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 "net/cert/cert_verify_proc_android.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 74 matching lines @@
     HashValue sha256(HASH_VALUE_SHA256);
     crypto::SHA256HashString(spki_bytes, sha256.data(), crypto::kSHA256Length);
     verify_result->public_key_hashes.push_back(sha256);
   }
 
   return true;
 }
 
 bool GetChainDEREncodedBytes(X509Certificate* cert,
                              std::vector<std::string>* chain_bytes) {
-  X509Certificate::OSCertHandle cert_handle = cert->os_cert_handle();
-  X509Certificate::OSCertHandles cert_handles =
-      cert->GetIntermediateCertificates();
-
-  // Make sure the peer's own cert is the first in the chain, if it's not
-  // already there.
-  if (cert_handles.empty() || cert_handles[0] != cert_handle)
-    cert_handles.insert(cert_handles.begin(), cert_handle);
+  X509Certificate::OSCertHandles cert_handles;
+  cert->GetCertificateChain(&cert_handles);
 
   chain_bytes->reserve(cert_handles.size());
   for (X509Certificate::OSCertHandles::const_iterator it =
        cert_handles.begin(); it != cert_handles.end(); ++it) {
     std::string cert_bytes;
     if(!X509Certificate::GetDEREncoded(*it, &cert_bytes))
       return false;
     chain_bytes->push_back(cert_bytes);
   }
   return true;
@@ skipping 28 matching lines @@
     NOTREACHED();
     return ERR_FAILED;
   }
   if (IsCertStatusError(verify_result->cert_status))
     return MapCertStatusToNetError(verify_result->cert_status);
 
   return OK;
 }
 
 }  // namespace net