Rename HTTP bad-related flags to be more clear

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 63e79be323f86661d5e7a0565b3d54f535605b87..7dbe63e6f648ae4c6b44732140274f8c57fd2ffa 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -195,16 +195,15 @@ const FeatureEntry::Choice kPassiveListenersChoices[] = {
      switches::kPassiveListenersDefault, "forcealltrue"},
 };
 
-const FeatureEntry::Choice kMarkNonSecureAsChoices[] = {
+const FeatureEntry::Choice kMarkHttpAsChoices[] = {
     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
-    {IDS_MARK_NON_SECURE_AS_NEUTRAL, security_state::switches::kMarkNonSecureAs,
-     security_state::switches::kMarkNonSecureAsNeutral},
-    {IDS_MARK_NON_SECURE_AS_NON_SECURE,
-     security_state::switches::kMarkNonSecureAs,
-     security_state::switches::kMarkNonSecureAsNonSecure},
-    {IDS_MARK_NON_SECURE_WITH_PASSWORDS_OR_CC_AS_NON_SECURE,
-     security_state::switches::kMarkNonSecureAs,
-     security_state::switches::kMarkNonSecureWithPasswordsOrCcAsNonSecure}};
+    {IDS_MARK_HTTP_AS_NEUTRAL, security_state::switches::kMarkHttpAs,
+     security_state::switches::kMarkHttpAsNeutral},
+    {IDS_MARK_HTTP_AS_NON_SECURE, security_state::switches::kMarkHttpAs,
+     security_state::switches::kMarkHttpAsNonSecure},
+    {IDS_MARK_HTTP_WITH_PASSWORDS_OR_CC_WITH_CHIP,
+     security_state::switches::kMarkHttpAs,
+     security_state::switches::kMarkHttpWithPasswordsOrCcWithChip}};
 
 const FeatureEntry::Choice kDataReductionProxyLoFiChoices[] = {
     { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -756,12 +755,12 @@ const FeatureEntry kFeatureEntries[] = {
      IDS_FLAGS_CONTEXTUAL_SEARCH_DESCRIPTION, kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableContextualSearch,
                                switches::kDisableContextualSearch)},
-     {"cs-now-on-tap-bar-integration",
-      IDS_FLAGS_CONTEXTUAL_SEARCH_NOW_ON_TAP_BAR_INTEGRATION,
-      IDS_FLAGS_CONTEXTUAL_SEARCH_NOW_ON_TAP_BAR_INTEGRATION_DESCRIPTION,
-      kOsAndroid,
-      SINGLE_VALUE_TYPE(
-          switches::kEnableContextualSearchNowOnTapBarIntegration)},
+    {"cs-now-on-tap-bar-integration",
+     IDS_FLAGS_CONTEXTUAL_SEARCH_NOW_ON_TAP_BAR_INTEGRATION,
+     IDS_FLAGS_CONTEXTUAL_SEARCH_NOW_ON_TAP_BAR_INTEGRATION_DESCRIPTION,
+     kOsAndroid,
+     SINGLE_VALUE_TYPE(
+         switches::kEnableContextualSearchNowOnTapBarIntegration)},
 #endif
     {"show-autofill-type-predictions",
      IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME,
@@ -1528,9 +1527,8 @@ const FeatureEntry kFeatureEntries[] = {
      IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnablePotentiallyAnnoyingSecurityFeatures)},
 #endif
-    {"mark-non-secure-as", IDS_MARK_NON_SECURE_AS_NAME,
-     IDS_MARK_NON_SECURE_AS_DESCRIPTION, kOsAll,
-     MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)},
+    {"mark-non-secure-as", IDS_MARK_HTTP_AS_NAME, IDS_MARK_HTTP_AS_DESCRIPTION,
+     kOsAll, MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
     {"enable-site-per-process", IDS_FLAGS_SITE_PER_PROCESS_NAME,
      IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kSitePerProcess)},
@@ -2089,9 +2087,9 @@ const FeatureEntry kFeatureEntries[] = {
     {"arc-use-auth-endpoint", IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_NAME,
      IDS_FLAGS_ARC_USE_AUTH_ENDPOINT_DESCRIPTION, kOsCrOS,
      SINGLE_VALUE_TYPE_AND_VALUE(
-       chromeos::switches::kArcUseAuthEndpoint,
-       "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" \
-       "ExchangeToken")},
+        chromeos::switches::kArcUseAuthEndpoint,
+        "https://www-googleapis-staging.sandbox.google.com/oauth2/v4/" \
+        "ExchangeToken")},
 #endif
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in