Stop using CertStore which is not compatible with PlzNavigate.

chrome/browser/ui/website_settings/website_settings_unittest.cc

Index: chrome/browser/ui/website_settings/website_settings_unittest.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index a86fbc9d7caa1d4a4ac890c0eafe005099531098..0d37bfc9061f204eaa7bea698ccf9e2812447377 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -25,7 +25,6 @@
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/infobars/core/infobar.h"
-#include "content/public/browser/cert_store.h"
 #include "content/public/common/ssl_status.h"
 #include "device/core/mock_device_client.h"
 #include "device/usb/mock_usb_device.h"
@@ -67,13 +66,6 @@ int SetSSLCipherSuite(int connection_status, int cipher_suite) {
   return cipher_suite | connection_status;
 }
 
-class MockCertStore : public content::CertStore {
- public:
-  virtual ~MockCertStore() {}
-  MOCK_METHOD2(StoreCert, int(net::X509Certificate*, int));
-  MOCK_METHOD2(RetrieveCert, bool(int, scoped_refptr<net::X509Certificate>*));
-};
-
 class MockWebsiteSettingsUI : public WebsiteSettingsUI {
  public:
   virtual ~MockWebsiteSettingsUI() {}
@@ -87,7 +79,7 @@ class MockWebsiteSettingsUI : public WebsiteSettingsUI {
 
 class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
  public:
-  WebsiteSettingsTest() : cert_id_(0), url_("http://www.example.com") {}
+  WebsiteSettingsTest() : url_("http://www.example.com") {}
 
   ~WebsiteSettingsTest() override {}
 
@@ -98,7 +90,6 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
     security_info_.security_level = SecurityStateModel::NONE;
 
     // Create the certificate.
-    cert_id_ = 1;
     cert_ =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), "ok_cert.pem");
     ASSERT_TRUE(cert_);
@@ -106,11 +97,6 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
     TabSpecificContentSettings::CreateForWebContents(web_contents());
     InfoBarService::CreateForWebContents(web_contents());
 
-    // Setup the mock cert store.
-    EXPECT_CALL(cert_store_, RetrieveCert(cert_id_, _) )
-        .Times(AnyNumber())
-        .WillRepeatedly(DoAll(SetArgPointee<1>(cert_), Return(true)));
-
     // Setup mock ui.
     mock_ui_.reset(new MockWebsiteSettingsUI());
     ON_CALL(*mock_ui_, SetPermissionInfo(_, _))
@@ -146,8 +132,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
   void ClearWebsiteSettings() { website_settings_.reset(nullptr); }
 
   const GURL& url() const { return url_; }
-  MockCertStore* cert_store() { return &cert_store_; }
-  int cert_id() { return cert_id_; }
+  scoped_refptr<net::X509Certificate> cert() { return cert_; }
   MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); }
   const SecurityStateModel::SecurityInfo& security_info() {
     return security_info_;
@@ -167,7 +152,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
     if (!website_settings_.get()) {
       website_settings_.reset(new WebsiteSettings(
           mock_ui(), profile(), tab_specific_content_settings(), web_contents(),
-          url(), security_info(), cert_store()));
+          url(), security_info()));
     }
     return website_settings_.get();
   }
@@ -182,9 +167,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
   device::MockDeviceClient device_client_;
   std::unique_ptr<WebsiteSettings> website_settings_;
   std::unique_ptr<MockWebsiteSettingsUI> mock_ui_;
-  int cert_id_;
   scoped_refptr<net::X509Certificate> cert_;
-  MockCertStore cert_store_;
   GURL url_;
   std::vector<std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>>
       last_chosen_object_info_;
@@ -363,7 +346,7 @@ TEST_F(WebsiteSettingsTest, HTTPConnection) {
 TEST_F(WebsiteSettingsTest, HTTPSConnection) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -507,7 +490,7 @@ TEST_F(WebsiteSettingsTest, InsecureContent) {
     security_info_ = SecurityStateModel::SecurityInfo();
     security_info_.security_level = test.security_level;
     security_info_.scheme_is_cryptographic = true;
-    security_info_.cert_id = cert_id();
+    security_info_.certificate = cert();
     security_info_.cert_status = test.cert_status;
     security_info_.security_bits = 81;  // No error if > 80.
     security_info_.mixed_content_status = test.mixed_content_status;
@@ -538,13 +521,10 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
       net::X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(google_der),
           sizeof(google_der));
-  int ev_cert_id = 1;
-  EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _)).WillRepeatedly(
-      DoAll(SetArgPointee<1>(ev_cert), Return(true)));
 
   security_info_.security_level = SecurityStateModel::NONE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = ev_cert_id;
+  security_info_.certificate = ev_cert;
   security_info_.cert_status = net::CERT_STATUS_IS_EV;
   security_info_.security_bits = 81;  // No error if > 80.
   security_info_.mixed_content_status =
@@ -569,7 +549,7 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
 TEST_F(WebsiteSettingsTest, HTTPSRevocationError) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -590,7 +570,7 @@ TEST_F(WebsiteSettingsTest, HTTPSRevocationError) {
 TEST_F(WebsiteSettingsTest, HTTPSConnectionError) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = -1;
   int status = 0;
@@ -611,7 +591,7 @@ TEST_F(WebsiteSettingsTest, HTTPSConnectionError) {
 TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) {
   security_info_.security_level = SecurityStateModel::SECURITY_POLICY_WARNING;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -632,7 +612,7 @@ TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) {
 TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
   security_info_.security_level = SecurityStateModel::NONE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -659,7 +639,7 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
 TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) {
   security_info_.security_level = SecurityStateModel::NONE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -687,7 +667,7 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) {
 TEST_F(WebsiteSettingsTest, UnknownSCTs) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -713,7 +693,7 @@ TEST_F(WebsiteSettingsTest, UnknownSCTs) {
 TEST_F(WebsiteSettingsTest, InvalidSCTs) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -741,7 +721,7 @@ TEST_F(WebsiteSettingsTest, InvalidSCTs) {
 TEST_F(WebsiteSettingsTest, ValidSCTs) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -769,13 +749,10 @@ TEST_F(WebsiteSettingsTest, ValidSCTsEV) {
   scoped_refptr<net::X509Certificate> ev_cert =
       net::X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(google_der), sizeof(google_der));
-  int ev_cert_id = 1;
-  EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _))
-      .WillRepeatedly(DoAll(SetArgPointee<1>(ev_cert), Return(true)));
 
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = ev_cert_id;
+  security_info_.certificate = ev_cert;
   security_info_.cert_status = net::CERT_STATUS_IS_EV;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -802,7 +779,7 @@ TEST_F(WebsiteSettingsTest, ValidSCTsEV) {
 TEST_F(WebsiteSettingsTest, UnknownAndInvalidSCTs) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;
@@ -829,7 +806,7 @@ TEST_F(WebsiteSettingsTest, UnknownAndInvalidSCTs) {
 TEST_F(WebsiteSettingsTest, ValidAndUnknownSCTs) {
   security_info_.security_level = SecurityStateModel::SECURE;
   security_info_.scheme_is_cryptographic = true;
-  security_info_.cert_id = cert_id();
+  security_info_.certificate = cert();
   security_info_.cert_status = 0;
   security_info_.security_bits = 81;  // No error if > 80.
   int status = 0;