Make form-not-secure controllable as its own separate Finch feature

components/security_state/core/security_state.cc

 // 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.
 
 #include "components/security_state/core/security_state.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 24 matching lines @@
     return true;
   }
 
   if (switch_or_field_trial_group == switches::kMarkHttpAsDangerous) {
     *level = DANGEROUS;
     *histogram_status = NON_SECURE;
     return true;
   }
 
   if (switch_or_field_trial_group ==
-          switches::kMarkHttpWithPasswordsOrCcWithChip ||
-      switch_or_field_trial_group ==
-          switches::kMarkHttpWithPasswordsOrCcWithChipAndFormWarning) {
+      switches::kMarkHttpWithPasswordsOrCcWithChip) {
     if (displayed_sensitive_input_on_http) {
       *level = security_state::HTTP_SHOW_WARNING;
     } else {
       *level = NONE;
     }
     *histogram_status = HTTP_SHOW_WARNING;
     return true;
   }
 
   return false;
@@ skipping 191 matching lines @@
 
   security_info->security_level = GetSecurityLevelForRequest(
       visible_security_state, used_policy_installed_certificate,
       is_origin_secure_callback, security_info->sha1_deprecation_status,
       security_info->mixed_content_status,
       security_info->content_with_cert_errors_status);
 }
 
 }  // namespace
 
+const base::Feature kHttpFormWarningFeature{"HttpFormWarning",
+                                            base::FEATURE_DISABLED_BY_DEFAULT};
+
 SecurityInfo::SecurityInfo()
     : security_level(NONE),
       malicious_content_status(MALICIOUS_CONTENT_STATUS_NONE),
       sha1_deprecation_status(NO_DEPRECATED_SHA1),
       mixed_content_status(CONTENT_STATUS_NONE),
       content_with_cert_errors_status(CONTENT_STATUS_NONE),
       scheme_is_cryptographic(false),
       cert_status(0),
       security_bits(-1),
       connection_status(0),
       key_exchange_group(0),
       obsolete_ssl_status(net::OBSOLETE_SSL_NONE),
       pkp_bypassed(false),
       displayed_password_field_on_http(false),
       displayed_credit_card_field_on_http(false) {}
 
 SecurityInfo::~SecurityInfo() {}
 
 void GetSecurityInfo(
     std::unique_ptr<VisibleSecurityState> visible_security_state,
     bool used_policy_installed_certificate,
     IsOriginSecureCallback is_origin_secure_callback,
     SecurityInfo* result) {
   SecurityInfoForRequest(*visible_security_state,
                          used_policy_installed_certificate,
                          is_origin_secure_callback, result);
 }
 
+bool IsHttpWarningInFormEnabled() {
+  return base::FeatureList::IsEnabled(kHttpFormWarningFeature);
+}
+
 VisibleSecurityState::VisibleSecurityState()
     : malicious_content_status(MALICIOUS_CONTENT_STATUS_NONE),
       connection_info_initialized(false),
       cert_status(0),
       connection_status(0),
       key_exchange_group(0),
       security_bits(-1),
       displayed_mixed_content(false),
       ran_mixed_content(false),
       displayed_content_with_cert_errors(false),
@@ skipping 19 matching lines @@
               other.displayed_content_with_cert_errors &&
           ran_content_with_cert_errors == other.ran_content_with_cert_errors &&
           pkp_bypassed == other.pkp_bypassed &&
           displayed_password_field_on_http ==
               other.displayed_password_field_on_http &&
           displayed_credit_card_field_on_http ==
               other.displayed_credit_card_field_on_http);
 }
 
 }  // namespace security_state