Adjust WebsiteSettings statuses for subresources with cert errors

chrome/browser/ui/website_settings/website_settings.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 CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ skipping 18 matching lines @@
 // information and allows users to change the permissions. |WebsiteSettings|
 // objects must be created on the heap. They destroy themselves after the UI is
 // closed.
 class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver {
  public:
   // TODO(palmer): Figure out if it is possible to unify SiteConnectionStatus
   // and SiteIdentityStatus.
   //
   // 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.
   enum SiteIdentityStatus {
     // No status about the website's identity available.
     SITE_IDENTITY_STATUS_UNKNOWN = 0,
     // The website provided a valid certificate.
     SITE_IDENTITY_STATUS_CERT,
     // The website provided a valid EV certificate.
     SITE_IDENTITY_STATUS_EV_CERT,
@@ skipping 180 matching lines @@
   ChromeSSLHostStateDelegate* chrome_ssl_host_state_delegate_;
 
   bool did_revoke_user_ssl_decisions_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_