Adjust WebsiteSettings statuses for subresources with cert errors

chrome/browser/ui/website_settings/website_settings.h

Index: chrome/browser/ui/website_settings/website_settings.h
diff --git a/chrome/browser/ui/website_settings/website_settings.h b/chrome/browser/ui/website_settings/website_settings.h
index 3104babf07aba7e24c529022010586ca0df49a4d..00e86130c67286cc89b10b8fff4e64f7d459e721 100644
--- a/chrome/browser/ui/website_settings/website_settings.h
+++ b/chrome/browser/ui/website_settings/website_settings.h
@@ -36,13 +36,13 @@ class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver {
   //
   // Status of a connection to a website.
   enum SiteConnectionStatus {
-    SITE_CONNECTION_STATUS_UNKNOWN = 0,      // No status available.
-    SITE_CONNECTION_STATUS_ENCRYPTED,        // Connection is encrypted.
-    SITE_CONNECTION_STATUS_MIXED_CONTENT,    // Non-secure passive content.
-    SITE_CONNECTION_STATUS_MIXED_SCRIPT,     // Non-secure active content.
-    SITE_CONNECTION_STATUS_UNENCRYPTED,      // Connection is not encrypted.
-    SITE_CONNECTION_STATUS_ENCRYPTED_ERROR,  // Connection error occurred.
-    SITE_CONNECTION_STATUS_INTERNAL_PAGE,    // Internal site.
+    SITE_CONNECTION_STATUS_UNKNOWN = 0,       // No status available.
+    SITE_CONNECTION_STATUS_ENCRYPTED,         // Connection is encrypted.
+    SITE_CONNECTION_STATUS_INSECURE_CONTENT,  // Non-secure passive content.

[felt, 2016/08/18 20:40:55]

nit: It is not clear anymore that this refers to subresources. That was obvious
for "mixed content", but now it isn't clear. Could you replace it with something
like SITE_CONNECTION_INSECURE_SUBRESOURCe?

[estark, 2016/08/19 12:55:50]

Done.

+    SITE_CONNECTION_STATUS_INSECURE_SCRIPT,   // Non-secure active content.

[felt, 2016/08/18 20:40:55]

To make sure I understand... mixed content & subresources with cert errors still
both share SITE_CONNECTION_STATUS_INSECURE_CONTENT and
SITE_CONNECTION_STATUS_INSECURE_SCRIPT? And you're just renaming to be clear it
applies to both?

[estark, 2016/08/19 12:55:49]

Yes, that's right.

+    SITE_CONNECTION_STATUS_UNENCRYPTED,       // Connection is not encrypted.
+    SITE_CONNECTION_STATUS_ENCRYPTED_ERROR,   // Connection error occurred.
+    SITE_CONNECTION_STATUS_INTERNAL_PAGE,     // Internal site.
   };
 
   // Validation status of a website's identity.