Add separate plumbing for subresources with certificate errors

components/security_state/security_state_model.h

Index: components/security_state/security_state_model.h
diff --git a/components/security_state/security_state_model.h b/components/security_state/security_state_model.h
index b4ff3e9c5f17b7eb1f19fa65ed2f73a815fe504c..4729a1e9abebebf42fe34a9d288e538472cc2d21 100644
--- a/components/security_state/security_state_model.h
+++ b/components/security_state/security_state_model.h
@@ -82,6 +82,18 @@ class SecurityStateModel {
     RAN_AND_DISPLAYED_MIXED_CONTENT,
   };
 
+  // Describes the type of content with certificate errors (if any) that a site
+  // displayed/ran.
+  enum ContentWithCertErrorsStatus {
+    NO_CONTENT_WITH_CERTIFICATE_ERRORS,
+    // The site displayed resources with certificate errors.
+    DISPLAYED_CONTENT_WITH_CERTIFICATE_ERRORS,
+    // The site ran code loaded with certificate errors.
+    RAN_CONTENT_WITH_CERTIFICATE_ERRORS,
+    // The site both ran and displayed content with certificate errors.
+    RAN_AND_DISPLAYED_CONTENT_WITH_CERTIFICATE_ERRORS,
+  };
+
   // Describes the security status of a page or request. This is the
   // main data structure provided by this class.
   struct SecurityInfo {
@@ -90,6 +102,7 @@ class SecurityStateModel {
     SecurityLevel security_level;
     SHA1DeprecationStatus sha1_deprecation_status;
     MixedContentStatus mixed_content_status;
+    ContentWithCertErrorsStatus content_with_cert_errors_status;
     // The verification statuses of the signed certificate timestamps
     // for the connection.
     std::vector<net::ct::SCTVerifyStatus> sct_verify_statuses;
@@ -139,6 +152,10 @@ class SecurityStateModel {
     bool ran_mixed_content;
     // True if PKP was bypassed due to a local trust anchor.
     bool pkp_bypassed;
+    // True if the page displayed content with certificate errors.
+    bool displayed_content_with_certificate_errors;
+    // True if the page ran content with certificate errors.
+    bool ran_content_with_certificate_errors;
   };
 
   // These security levels describe the treatment given to pages that