Teach SecurityStateModel about subresources with cert errors

components/security_state/security_state_model_unittest.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 "components/security_state/security_state_model.h"
 
 #include <stdint.h>
 
 #include "components/security_state/security_state_model_client.h"
 #include "net/cert/x509_certificate.h"
@@ skipping 10 matching lines @@
 const char kUrl[] = "https://foo.test";
 
 class TestSecurityStateModelClient : public SecurityStateModelClient {
  public:
   TestSecurityStateModelClient()
       : initial_security_level_(SecurityStateModel::SECURE),
         connection_status_(net::SSL_CONNECTION_VERSION_TLS1_2
                            << net::SSL_CONNECTION_VERSION_SHIFT),
         cert_status_(net::CERT_STATUS_SHA1_SIGNATURE_PRESENT),
         displayed_mixed_content_(false),
-        ran_mixed_content_(false) {
+        ran_mixed_content_(false),
+        displayed_content_with_cert_errors_(false),
+        ran_content_with_cert_errors_(false) {
     cert_ =
         net::ImportCertFromFile(net::GetTestCertsDirectory(), "sha1_2016.pem");
   }
   ~TestSecurityStateModelClient() override {}
 
   void set_connection_status(int connection_status) {
     connection_status_ = connection_status;
   }
   void SetCipherSuite(uint16_t ciphersuite) {
     net::SSLConnectionStatusSetCipherSuite(ciphersuite, &connection_status_);
   }
   void AddCertStatus(net::CertStatus cert_status) {
     cert_status_ |= cert_status;
   }
   void SetDisplayedMixedContent(bool displayed_mixed_content) {
     displayed_mixed_content_ = displayed_mixed_content;
   }
   void SetRanMixedContent(bool ran_mixed_content) {
     ran_mixed_content_ = ran_mixed_content;
   }
+  void SetDisplayedContentWithCertErrors(
+      bool displayed_content_with_cert_errors) {
+    displayed_content_with_cert_errors_ = displayed_content_with_cert_errors;
+  }
+  void SetRanContentWithCertErrors(bool ran_content_with_cert_errors) {
+    ran_content_with_cert_errors_ = ran_content_with_cert_errors;
+  }
   void set_initial_security_level(
       SecurityStateModel::SecurityLevel security_level) {
     initial_security_level_ = security_level;
   }
 
   // SecurityStateModelClient:
   void GetVisibleSecurityState(
       SecurityStateModel::VisibleSecurityState* state) override {
     state->initialized = true;
     state->url = GURL(kUrl);
     state->initial_security_level = initial_security_level_;
     state->cert_id = 1;
     state->cert_status = cert_status_;
     state->connection_status = connection_status_;
     state->security_bits = 256;
     state->displayed_mixed_content = displayed_mixed_content_;
     state->ran_mixed_content = ran_mixed_content_;
+    state->displayed_content_with_cert_errors =
+        displayed_content_with_cert_errors_;
+    state->ran_content_with_cert_errors = ran_content_with_cert_errors_;
   }
 
   bool RetrieveCert(scoped_refptr<net::X509Certificate>* cert) override {
     *cert = cert_;
     return true;
   }
 
   bool UsedPolicyInstalledCertificate() override { return false; }
 
   // Always returns true because all unit tests in this file test
   // scenarios in which the origin is secure.
   bool IsOriginSecure(const GURL& url) override { return true; }
 
  private:
   SecurityStateModel::SecurityLevel initial_security_level_;
   scoped_refptr<net::X509Certificate> cert_;
   int connection_status_;
   net::CertStatus cert_status_;
   bool displayed_mixed_content_;
   bool ran_mixed_content_;
+  bool displayed_content_with_cert_errors_;
+  bool ran_content_with_cert_errors_;
 };
 
 // Tests that SHA1-signed certificates expiring in 2016 downgrade the
 // security state of the page.
 TEST(SecurityStateModelTest, SHA1Warning) {
   TestSecurityStateModelClient client;
   SecurityStateModel model;
   model.SetClient(&client);
   const SecurityStateModel::SecurityInfo& security_info =
       model.GetSecurityInfo();
@@ skipping 87 matching lines @@
                                << net::SSL_CONNECTION_VERSION_SHIFT);
   client.SetCipherSuite(ciphersuite);
   const SecurityStateModel::SecurityInfo& security_info =
       model.GetSecurityInfo();
   EXPECT_FALSE(security_info.is_secure_protocol_and_ciphersuite);
 }
 
 }  // namespace
 
 }  // namespace security_state