Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

components/security_state/security_state_model.h

 // Copyright 2015 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 COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_
 #define COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_
 
 #include "base/macros.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/sct_status_flags.h"
@@ skipping 52 matching lines @@
     // The connection used a certificate with a SHA1 signature in the
     // chain, and policy says that the connection should be treated with a
     // warning.
     DEPRECATED_SHA1_MINOR,
     // The connection used a certificate with a SHA1 signature in the
     // chain, and policy says that the connection should be treated as
     // broken HTTPS.
     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
   // main data structure provided by this class.
   struct SecurityInfo {
     SecurityInfo();
     ~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;
     bool scheme_is_cryptographic;
     net::CertStatus cert_status;
     int cert_id;
     // The security strength, in bits, of the SSL cipher suite. In late
     // 2015, 128 is considered the minimum.
     // 0 means the connection is not encrypted.
     // -1 means the security strength is unknown.
@@ skipping 62 matching lines @@
   mutable VisibleSecurityState visible_security_state_;
 
   SecurityStateModelClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(SecurityStateModel);
 };
 
 }  // namespace security_state
 
 #endif  // COMPONENTS_SECURITY_STATE_SECURITY_STATE_MODEL_H_