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

chrome/browser/ui/android/website_settings_popup_android.cc

 // Copyright (c) 2013 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/ui/android/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 26 matching lines @@
   if (!web_contents)
     return NULL;
 
   int cert_id =
       web_contents->GetController().GetVisibleEntry()->GetSSL().cert_id;
   scoped_refptr<net::X509Certificate> cert;
   bool ok = CertStore::GetInstance()->RetrieveCert(cert_id, &cert);
   CHECK(ok);
 
   std::vector<std::string> cert_chain;
-  net::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->os_cert_handle())
-    cert_handles.insert(cert_handles.begin(), cert->os_cert_handle());
+  net::X509Certificate::OSCertHandles cert_handles;
+  cert->GetCertificateChain(&cert_handles);
 
   cert_chain.reserve(cert_handles.size());
   for (net::X509Certificate::OSCertHandles::const_iterator it =
            cert_handles.begin();
        it != cert_handles.end();
        ++it) {
     std::string cert_bytes;
     net::X509Certificate::GetDEREncoded(*it, &cert_bytes);
     cert_chain.push_back(cert_bytes);
   }
@@ skipping 113 matching lines @@
 void WebsiteSettingsPopupAndroid::SetFirstVisit(
     const base::string16& first_visit) {
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }