Add separate plumbing for subresources with certificate errors

content/public/common/ssl_status.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
 #define CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
 
 #include <vector>
 
 #include "content/common/content_export.h"
 #include "content/public/common/security_style.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/sct_status_flags.h"
 
 namespace net {
 class SSLInfo;
 }
 
 namespace content {
 
 // Collects the SSL information for this NavigationEntry.
 struct CONTENT_EXPORT SSLStatus {
   // Flags used for the page security content status.
   enum ContentStatusFlags {
     // HTTP page, or HTTPS page with no insecure content.
-    NORMAL_CONTENT             = 0,
+    NORMAL_CONTENT = 0,
 
-    // HTTPS page containing "displayed" HTTP resources (e.g. images, CSS).
+    // HTTPS page containing "displayed" HTTP subresources (e.g. images, CSS).
     DISPLAYED_INSECURE_CONTENT = 1 << 0,
 
-    // HTTPS page containing "executed" HTTP resources (i.e. script).
-    // Also currently used for HTTPS page containing broken-HTTPS resources;
-    // this is wrong and should be fixed (see comments in
-    // SSLPolicy::OnRequestStarted()).
-    RAN_INSECURE_CONTENT       = 1 << 1,
+    // HTTPS page containing "executed" HTTP subresources (i.e. script).
+    RAN_INSECURE_CONTENT = 1 << 1,
+
+    // HTTPS page containing "displayed" HTTPS subresources (e.g. images,
+    // CSS) loaded with certificate errors.
+    DISPLAYED_CONTENT_WITH_CERTIFICATE_ERRORS = 1 << 2,
+
+    // HTTPS page containing "executed" HTTPS subresources (e.g. script)
+    // loaded with certificate errors.
+    RAN_CONTENT_WITH_CERTIFICATE_ERRORS = 1 << 3,
   };
 
   SSLStatus();
   SSLStatus(SecurityStyle security_style,
             int cert_id,
             const net::SSLInfo& ssl_info);
   SSLStatus(const SSLStatus& other);
   ~SSLStatus();
 
   bool Equals(const SSLStatus& status) const {
@@ skipping 20 matching lines @@
   // of Certificate Transparency (CT) that were served with the
   // main resource.
   std::vector<net::ct::SCTVerifyStatus> sct_statuses;
   // True if PKP was bypassed due to a local trust anchor.
   bool pkp_bypassed;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SSL_STATUS_H_