Stop using CertStore which is not compatible with PlzNavigate.

chrome/browser/ui/android/connection_info_popup_android.cc

 // Copyright 2015 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/connection_info_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/stl_util.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
 #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"
 #include "content/public/common/ssl_status.h"
 #include "jni/ConnectionInfoPopup_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::CheckException;
 using base::android::ConvertUTF8ToJavaString;
 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(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   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 =
       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());
 
   cert_chain.reserve(cert_handles.size());
@@ skipping 33 matching lines @@
 
   popup_jobject_.Reset(env, java_website_settings_pop);
 
   ChromeSecurityStateModelClient* security_model_client =
       ChromeSecurityStateModelClient::FromWebContents(web_contents);
   DCHECK(security_model_client);
 
   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() {
 }
 
 void ConnectionInfoPopupAndroid::Destroy(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
@@ skipping 11 matching lines @@
   {
     int icon_id = ResourceMapper::MapFromChromiumId(
         WebsiteSettingsUI::GetIdentityIconID(identity_info.identity_status));
 
     // The headline and the certificate dialog link of the site's identity
     // section is only displayed if the site's identity was verified. If the
     // site's identity was verified, then the headline contains the organization
     // 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;
     }
 
     ScopedJavaLocalRef<jstring> description =
         ConvertUTF8ToJavaString(env, identity_info.identity_status_description);
     base::string16 certificate_label;
 
     // Only show the certificate viewer link if the connection actually used a
     // certificate.
     if (identity_info.identity_status !=
@@ skipping 52 matching lines @@
   // There's no tab UI on Android - only connection info is shown.
   NOTIMPLEMENTED();
 }
 
 // static
 bool
 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }