Remove should_suppress_mixed_content_warning

This CL removes the should_suppress_mixed_content_warning flag from
SecurityState, which was originally added to support an enterprise
policy that has since been removed.

Bug: 1110090
Change-Id: I6b36f2c8edd18c9eb36f00d8dc5558a6cfde42f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2343570Reviewed-by: Carlos IL <carlosil@chromium.org>
Reviewed-by: Christopher Thompson <cthomp@chromium.org>
Commit-Queue: Jonathan Chávez <tabaresj@google.com>
Cr-Commit-Position: refs/heads/master@{#797084}

components/security_state/core/security_state.cc

@@ -44,14 +44,6 @@ SecurityLevel GetSecurityLevelForNonSecureFieldTrial(
   return input_events.insecure_field_edited ? DANGEROUS : WARNING;
 }
 
-SecurityLevel GetSecurityLevelForDisplayedMixedContent(bool suppress_warning) {
-  if (base::FeatureList::IsEnabled(features::kPassiveMixedContentWarning) &&
-      !suppress_warning) {
-    return kDisplayedInsecureContentWarningLevel;
-  }
-  return kDisplayedInsecureContentLevel;
-}
-
 std::string GetHistogramSuffixForSecurityLevel(
     security_state::SecurityLevel level) {
   switch (level) {
@@ -223,8 +215,10 @@ SecurityLevel GetSecurityLevel(
   DCHECK(!visible_security_state.ran_content_with_cert_errors);
 
   if (visible_security_state.displayed_mixed_content) {
-    return GetSecurityLevelForDisplayedMixedContent(
-        visible_security_state.should_suppress_mixed_content_warning);
+    if (base::FeatureList::IsEnabled(features::kPassiveMixedContentWarning)) {
+      return kDisplayedInsecureContentWarningLevel;
+    }
+    return kDisplayedInsecureContentLevel;
   }
 
   if ((visible_security_state.contained_mixed_form &&
@@ -281,7 +275,6 @@ VisibleSecurityState::VisibleSecurityState()
       is_reader_mode(false),
       connection_used_legacy_tls(false),
       should_suppress_legacy_tls_warning(false),
-      should_suppress_mixed_content_warning(false),
       should_treat_displayed_mixed_forms_as_secure(false) {}
 
 VisibleSecurityState::VisibleSecurityState(const VisibleSecurityState& other) =

components/security_state/core/security_state.h

@@ -204,10 +204,6 @@ struct VisibleSecurityState {
   // True if the page should be excluded from a UI treatment for legacy TLS
   // (used for control group in an experimental UI rollout).
   bool should_suppress_legacy_tls_warning;
-  // True if the page should be excluded from a warning UI treatment for mixed
-  // content. If set to false, the page will receive a neutral (rather than
-  // positively secure) UI treatment.
-  bool should_suppress_mixed_content_warning;
   // True if mixed forms should be treated as secure from the visible security
   // state perspective (for example, if a different warning is being shown for
   // them).