Stop using CertStore which is not compatible with PlzNavigate.

ios/web/net/crw_ssl_status_updater.mm

 // Copyright 2016 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.
 
 #import "ios/web/net/crw_ssl_status_updater.h"
 
 #import "base/ios/weak_nsobject.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/strings/sys_string_conversions.h"
 #include "ios/web/public/cert_store.h"

[Eugene But (OOO till 7-30), 2016/09/08 16:57:46]

ditto

 #import "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/ssl_status.h"
 #import "ios/web/web_state/wk_web_view_security_util.h"
 #include "net/cert/x509_certificate.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
@@ skipping 73 matching lines @@
   // |hasOnlySecureContent| returns NO it means passive content.
   item->GetSSL().content_status =
       hasOnlySecureContent ? web::SSLStatus::NORMAL_CONTENT
                            : web::SSLStatus::DISPLAYED_INSECURE_CONTENT;
 
   // Try updating SSLStatus for current NavigationItem asynchronously.
   scoped_refptr<net::X509Certificate> cert;
   if (item->GetURL().SchemeIsCryptographic()) {
     cert = web::CreateCertFromTrust(trust);
     if (cert) {
-      int oldCertID = item->GetSSL().cert_id;
+      scoped_refptr<net::X509Certificate> oldCert = item->GetSSL().certificate;
       std::string oldHost = item->GetSSL().cert_status_host;
-      item->GetSSL().cert_id = web::CertStore::GetInstance()->StoreCert(
-          cert.get(), self.certGroupID);
+      item->GetSSL().certificate = cert;
       item->GetSSL().cert_status_host = base::SysNSStringToUTF8(host);
       // Only recompute the SSLStatus information if the certificate or host has
       // since changed. Host can be changed in case of redirect.
-      if (oldCertID != item->GetSSL().cert_id ||
+      if (!oldCert.get() || !oldCert->Equals(cert.get()) ||
           oldHost != item->GetSSL().cert_status_host) {
         // Real SSL status is unknown, reset cert status and security style.
         // They will be asynchronously updated in
         // |scheduleSSLStatusUpdateUsingTrust:host:|.
         item->GetSSL().cert_status = CertStatus();
         item->GetSSL().security_style = web::SECURITY_STYLE_UNKNOWN;
 
         [self scheduleSSLStatusUpdateUsingTrust:std::move(trust) host:host];
       }
     }
   }
 
   if (!cert) {
-    item->GetSSL().cert_id = 0;
+    item->GetSSL().certificate = nullptr;
     if (!item->GetURL().SchemeIsCryptographic()) {
       // HTTP or other non-secure connection.
       item->GetSSL().security_style = web::SECURITY_STYLE_UNAUTHENTICATED;
     } else {
       // HTTPS, no certificate (this use-case has not been observed).
       item->GetSSL().security_style = web::SECURITY_STYLE_UNKNOWN;
     }
   }
 
   if (!previousSSLStatus.Equals(item->GetSSL())) {
@@ skipping 11 matching lines @@
   // The searched item almost always be the last one, so walk backward rather
   // than forward.
   for (int i = _navigationManager->GetItemCount() - 1; 0 <= i; i--) {
     web::NavigationItem* item = _navigationManager->GetItemAtIndex(i);
     if (item->GetUniqueID() != navigationItemID)
       continue;
 
     // NavigationItem's UniqueID is preserved even after redirects, so
     // checking that cert and URL match is necessary.
     scoped_refptr<net::X509Certificate> cert(web::CreateCertFromTrust(trust));
-    int certID =
-        web::CertStore::GetInstance()->StoreCert(cert.get(), self.certGroupID);
     std::string GURLHost = base::SysNSStringToUTF8(host);
     web::SSLStatus& SSLStatus = item->GetSSL();
-    if (item->GetURL().SchemeIsCryptographic() && SSLStatus.cert_id == certID &&
+    if (item->GetURL().SchemeIsCryptographic() &&
+        !!SSLStatus.certificate.get() &&
+        SSLStatus.certificate->Equals(cert.get()) &&
         item->GetURL().host() == GURLHost) {
       web::SSLStatus previousSSLStatus = item->GetSSL();
       SSLStatus.cert_status = certStatus;
       SSLStatus.security_style = style;
       if (!previousSSLStatus.Equals(SSLStatus)) {
         [self didChangeSSLStatusForNavigationItem:item];
       }
     }
     return;
   }
@@ skipping 21 matching lines @@
 
 - (void)didChangeSSLStatusForNavigationItem:(web::NavigationItem*)navItem {
   if ([_delegate respondsToSelector:
           @selector(SSLStatusUpdater:didChangeSSLStatusForNavigationItem:)]) {
     [_delegate SSLStatusUpdater:self
         didChangeSSLStatusForNavigationItem:navItem];
   }
 }
 
 @end