Stop using CertStore which is not compatible with PlzNavigate.

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 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 "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 15 matching lines @@
 #import "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
-#include "content/public/browser/cert_store.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
 #import "ui/base/cocoa/flipped_view.h"
@@ skipping 370 matching lines @@
   if (isDevToolsDisabled_) {
     [self showCertificateInfo:sender];
   } else {
     DevToolsWindow::OpenDevToolsWindow(
         webContents_, DevToolsToggleAction::ShowSecurityPanel());
   }
 }
 
 // Handler for the link button to show certificate information.
 - (void)showCertificateInfo:(id)sender {
-  DCHECK(certificateId_);
+  DCHECK(certificate_.get());
   DCHECK(presenter_);
   presenter_->RecordWebsiteSettingsAction(
       WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED);
-  ShowCertificateViewerByID(webContents_, [self parentWindow], certificateId_);
+  ShowCertificateViewer(webContents_, [self parentWindow], certificate_.get());
 }
 
 // Handler for the link button to revoke user certificate decisions.
 - (void)resetCertificateDecisions:(id)sender {
   DCHECK(resetDecisionsButton_);
   presenter_->OnRevokeSSLErrorBypassButtonPressed();
   [self close];
 }
 
 // Set the Y position of |view| to the given position, and return the position
@@ skipping 46 matching lines @@
   CGFloat yPos = 0;
 
   [self sizeTextFieldHeightToFit:identityField_];
   yPos = [self setYPositionOfView:identityField_
                                to:yPos + kSectionVerticalPadding];
 
   [self sizeTextFieldHeightToFit:securitySummaryField_];
   yPos = [self setYPositionOfView:securitySummaryField_
                                to:yPos + kSpacingBeforeSecuritySummary];
 
-  if (isDevToolsDisabled_ && certificateId_ == 0) {
+  if (isDevToolsDisabled_ && !certificate_) {
     // -removeFromSuperview is idempotent.
     [securityDetailsButton_ removeFromSuperview];
   } else {
     // -addSubview is idempotent.
     [securitySectionView_ addSubview:securityDetailsButton_];
     yPos = [self setYPositionOfView:securityDetailsButton_ to:yPos];
   }
 
   if (resetDecisionsButton_) {
     yPos = [self setYPositionOfView:resetDecisionsButton_
@@ skipping 167 matching lines @@
   return button.get();
 }
 
 // Set the content of the identity and identity status fields.
 - (void)setIdentityInfo:(const WebsiteSettingsUI::IdentityInfo&)identityInfo {
   [identityField_
       setStringValue:base::SysUTF8ToNSString(identityInfo.site_identity)];
   [securitySummaryField_ setStringValue:base::SysUTF16ToNSString(
                                             identityInfo.GetSecuritySummary())];
 
-  certificateId_ = identityInfo.cert_id;
+  certificate_ = identityInfo.certificate;
 
-  if (certificateId_ &&  identityInfo.show_ssl_decision_revoke_button) {
+  if (certificate_ &&  identityInfo.show_ssl_decision_revoke_button) {
     NSString* text = l10n_util::GetNSString(
         IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON);
     resetDecisionsButton_ =
         [self addButtonWithText:text toView:securitySectionView_];
     [resetDecisionsButton_ setTarget:self];
     [resetDecisionsButton_ setAction:@selector(resetCertificateDecisions:)];
   }
 
   [self performLayout];
 }
@@ skipping 476 matching lines @@
                       webContents:web_contents
                               url:virtual_url
                isDevToolsDisabled:is_devtools_disabled];
 
   if (!IsInternalURL(virtual_url)) {
     // Initialize the presenter, which holds the model and controls the UI.
     // This is also owned by the bubble controller.
     WebsiteSettings* presenter = new WebsiteSettings(
         bridge, profile,
         TabSpecificContentSettings::FromWebContents(web_contents), web_contents,
-        virtual_url, security_info, content::CertStore::GetInstance());
+        virtual_url, security_info);
     [bubble_controller setPresenter:presenter];
   }
 
   [bubble_controller showWindow:nil];
 }
 
 void WebsiteSettingsUIBridge::SetIdentityInfo(
     const WebsiteSettingsUI::IdentityInfo& identity_info) {
   [bubble_controller_ setIdentityInfo:identity_info];
 }
@@ skipping 13 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:chosen_object_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }