Teach SSLHostStateDelegate about subresources with cert errors

chrome/browser/ssl/chrome_ssl_host_state_delegate.h

Index: chrome/browser/ssl/chrome_ssl_host_state_delegate.h
diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
index 8a01205cdb47cd450cf0f42cfc80a970d9f87eec..06db994b668e2c07dd3c36549501f19e1f19c5da 100644
--- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
+++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
@@ -37,9 +37,13 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
                            const net::X509Certificate& cert,
                            net::CertStatus error,
                            bool* expired_previous_decision) override;
-  void HostRanInsecureContent(const std::string& host, int pid) override;
-  bool DidHostRunInsecureContent(const std::string& host,
-                                 int pid) const override;
+  void HostRanInsecureContent(const std::string& host,
+                              int pid,
+                              InsecureContentType content_type) override;
+  bool DidHostRunInsecureContent(
+      const std::string& host,
+      int pid,
+      InsecureContentType content_type) const override;
 
   // Revokes all SSL certificate error allow exceptions made by the user for
   // |host| in the given Profile.
@@ -110,10 +114,14 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
   // contains insecure content in that renderer process.
   typedef std::pair<std::string, int> BrokenHostEntry;
 
-  // Hosts which have been contaminated with insecure content in the
+  // Hosts which have been contaminated with insecure mixed content in the
   // specified process.  Note that insecure content can travel between
   // same-origin frames in one processs but cannot jump between processes.
-  std::set<BrokenHostEntry> ran_insecure_content_hosts_;
+  std::set<BrokenHostEntry> ran_mixed_content_hosts_;
+
+  // Hosts which have been contaminated with content with certificate errors in
+  // the specific process.
+  std::set<BrokenHostEntry> ran_content_with_cert_errors_hosts_;

[jww, 2016/08/11 18:50:15]

nit: Can you add a #include<set>? This should have been there already, but
apparently it's missing.

[estark, 2016/08/11 20:58:38]

Done.

 
   // This is a GUID to mark this unique session. Whenever a certificate decision
   // expiration is set, the GUID is saved as well so Chrome can tell if it was