Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

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..3dc4f9adf7790f13a711c3d1f322aeb99f67b7aa 100644
--- a/components/security_state/security_state_model.h
+++ b/components/security_state/security_state_model.h
@@ -70,16 +70,15 @@ class SecurityStateModel {
     DEPRECATED_SHA1_MAJOR,
   };
 
-  // Describes the type of mixed content (if any) that a site
-  // displayed/ran.
-  enum MixedContentStatus {
-    NO_MIXED_CONTENT,
-    // The site displayed insecure resources (passive mixed content).
-    DISPLAYED_MIXED_CONTENT,
-    // The site ran insecure code (active mixed content).
-    RAN_MIXED_CONTENT,
-    // The site both ran and displayed insecure resources.
-    RAN_AND_DISPLAYED_MIXED_CONTENT,
+  // The ContentStatus enum is used to describe content on the page that
+  // has significantly different security properties than the main page
+  // load. Content can be passive content that is displayed (such as
+  // images) or active content that is run (such as scripts or iframes).
+  enum ContentStatus {
+    CONTENT_STATUS_NONE,
+    CONTENT_STATUS_DISPLAYED,
+    CONTENT_STATUS_RAN,
+    CONTENT_STATUS_DISPLAYED_AND_RAN,
   };
 
   // Describes the security status of a page or request. This is the
@@ -89,7 +88,9 @@ class SecurityStateModel {
     ~SecurityInfo();
     SecurityLevel security_level;
     SHA1DeprecationStatus sha1_deprecation_status;
-    MixedContentStatus mixed_content_status;
+    // |mixed_content_status| describes the presence of content that was
+    // loaded over a nonsecure (HTTP) connection.
+    ContentStatus mixed_content_status;

[felt, 2016/08/11 19:30:26]

nit: weird to leave it named mixed_content_status after renaming the enum to
ContentStatus?

     // The verification statuses of the signed certificate timestamps
     // for the connection.
     std::vector<net::ct::SCTVerifyStatus> sct_verify_statuses;