Stop using CertStore which is not compatible with PlzNavigate.

chrome/browser/ui/android/connection_info_popup_android.cc

Index: chrome/browser/ui/android/connection_info_popup_android.cc
diff --git a/chrome/browser/ui/android/connection_info_popup_android.cc b/chrome/browser/ui/android/connection_info_popup_android.cc
index 36de7719c43cfe04ec29c517a9f3ff30131f5d79..9e9060e197df522c02b4fb5659d63ea4c0c70e8f 100644
--- a/chrome/browser/ui/android/connection_info_popup_android.cc
+++ b/chrome/browser/ui/android/connection_info_popup_android.cc
@@ -16,7 +16,6 @@
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
@@ -31,7 +30,6 @@ using base::android::ConvertUTF16ToJavaString;
 using base::android::GetClass;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
-using content::CertStore;
 using content::WebContents;
 
 static ScopedJavaLocalRef<jobjectArray> GetCertificateChain(
@@ -43,11 +41,8 @@ static ScopedJavaLocalRef<jobjectArray> GetCertificateChain(
   if (!web_contents)
     return ScopedJavaLocalRef<jobjectArray>();
 
-  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);
+  scoped_refptr<net::X509Certificate> cert =
+      web_contents->GetController().GetVisibleEntry()->GetSSL().certificate;
 
   std::vector<std::string> cert_chain;
   net::X509Certificate::OSCertHandles cert_handles =
@@ -101,8 +96,7 @@ ConnectionInfoPopupAndroid::ConnectionInfoPopupAndroid(
   presenter_.reset(new WebsiteSettings(
       this, Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
-      nav_entry->GetURL(), security_model_client->GetSecurityInfo(),
-      content::CertStore::GetInstance()));
+      nav_entry->GetURL(), security_model_client->GetSecurityInfo()));
 }
 
 ConnectionInfoPopupAndroid::~ConnectionInfoPopupAndroid() {
@@ -134,7 +128,7 @@ void ConnectionInfoPopupAndroid::SetIdentityInfo(
     // name from the provided certificate. If the organization name is not
     // available than the hostname of the site is used instead.
     std::string headline;
-    if (identity_info.cert_id) {
+    if (identity_info.certificate) {
       headline = identity_info.site_identity;
     }