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

components/security_state/core/security_state.cc

Index: components/security_state/core/security_state.cc
diff --git a/components/security_state/core/security_state.cc b/components/security_state/core/security_state.cc
index e0da8bdf7e13b41c244a613329fb35d04b43f27f..328871f56d4032a184982fbb4ac41ddedf59f096 100644
--- a/components/security_state/core/security_state.cc
+++ b/components/security_state/core/security_state.cc
@@ -42,9 +42,7 @@ bool GetSecurityLevelAndHistogramValueForNonSecureFieldTrial(
   }
 
   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 {
@@ -256,6 +254,9 @@ void SecurityInfoForRequest(
 
 }  // namespace
 
+const base::Feature kHttpFormWarningFeature{"HttpFormWarning",
+                                            base::FEATURE_DISABLED_BY_DEFAULT};
+
 SecurityInfo::SecurityInfo()
     : security_level(NONE),
       malicious_content_status(MALICIOUS_CONTENT_STATUS_NONE),
@@ -284,6 +285,10 @@ void GetSecurityInfo(
                          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),