Rename HTTP bad-related flags to be more clear

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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 "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 177 matching lines @@
 #endif
 
 const FeatureEntry::Choice kPassiveListenersChoices[] = {
     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
     {IDS_FLAGS_PASSIVE_EVENT_LISTENER_TRUE, switches::kPassiveListenersDefault,
      "true"},
     {IDS_FLAGS_PASSIVE_EVENT_LISTENER_FORCE_ALL_TRUE,
      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, "", "" },
     { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_ALWAYS_ON,
         data_reduction_proxy::switches::kDataReductionProxyLoFi,
         data_reduction_proxy::switches::kDataReductionProxyLoFiValueAlwaysOn},
     { IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_CELLULAR_ONLY,
         data_reduction_proxy::switches::kDataReductionProxyLoFi,
         data_reduction_proxy::switches::
             kDataReductionProxyLoFiValueCellularOnly},
@@ skipping 531 matching lines @@
      IDS_FLAGS_HISTORY_REQUIRES_USER_GESTURE_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kHistoryEntryRequiresUserGesture)},
     {"disable-hyperlink-auditing", IDS_FLAGS_HYPERLINK_AUDITING_NAME,
      IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION, kOsAll,
      SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)},
 #if defined(OS_ANDROID)
     {"contextual-search", IDS_FLAGS_CONTEXTUAL_SEARCH,
      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,
      IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions)},
     {"enable-credit-card-signin-promo",
      IDS_FLAGS_ENABLE_AUTOFILL_CREDIT_CARD_SIGNIN_PROMO_NAME,
      IDS_FLAGS_ENABLE_AUTOFILL_CREDIT_CARD_SIGNIN_PROMO_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(autofill::kAutofillCreditCardSigninPromo)},
     {"smooth-scrolling", IDS_FLAGS_SMOOTH_SCROLLING_NAME,
@@ skipping 746 matching lines @@
      SINGLE_VALUE_TYPE("enable-touch-hover")},
 #if defined(OS_CHROMEOS)
     {"enable-wifi-credential-sync", IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME,
      IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION, kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)},
     {"enable-potentially-annoying-security-features",
      IDS_FLAGS_EXPERIMENTAL_SECURITY_FEATURES_NAME,
      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)},
     {"enable-top-document-isolation", IDS_FLAGS_TOP_DOCUMENT_ISOLATION_NAME,
      IDS_FLAGS_TOP_DOCUMENT_ISOLATION_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kTopDocumentIsolation)},
     {"enable-use-zoom-for-dsf", IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_NAME,
      IDS_FLAGS_ENABLE_USE_ZOOM_FOR_DSF_DESCRIPTION, kOsAll,
      MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)},
 #if defined(OS_MACOSX)
@@ skipping 538 matching lines @@
      IDS_FLAGS_ENABLE_EHV_INPUT_NAME, IDS_FLAGS_ENABLE_EHV_INPUT_DESCRIPTION,
      kOsCrOS, FEATURE_VALUE_TYPE(features::kEHVInputOnImeMenu)},
 #endif
     {"enable-gamepad-extensions", IDS_FLAGS_GAMEPAD_EXTENSIONS_NAME,
      IDS_FLAGS_GAMEPAD_EXTENSIONS_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kGamepadExtensions)},
 #if defined(OS_CHROMEOS)
     {"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
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 class FlagsStateSingleton {
  public:
   FlagsStateSingleton()
       : flags_state_(kFeatureEntries, arraysize(kFeatureEntries)) {}
@@ skipping 163 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags