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

chrome/browser/ui/android/website_settings_popup_android.cc

Index: chrome/browser/ui/android/website_settings_popup_android.cc
diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc
index 1c0aabb861159c1090f0125fae56ff2fd5730b1c..3590a49039bc0b06665533f6cb0bd1299117b04b 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.cc
+++ b/chrome/browser/ui/android/website_settings_popup_android.cc
@@ -44,12 +44,8 @@ static jobjectArray GetCertificateChain(JNIEnv* env,
   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 =