Make flags resources naming consistent

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 142 matching lines @@
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     switches::kTouchEventFeatureDetection,
     switches::kTouchEventFeatureDetectionEnabled },
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     switches::kTouchEventFeatureDetection,
     switches::kTouchEventFeatureDetectionDisabled }
 };
 
 #if defined(USE_AURA)
 const FeatureEntry::Choice kOverscrollHistoryNavigationChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", "" },
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
-    switches::kOverscrollHistoryNavigation,
-    "0" },
-  { IDS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
-    switches::kOverscrollHistoryNavigation,
-    "2" }
-};
+    {IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, "", ""},
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+     switches::kOverscrollHistoryNavigation, "0"},
+    {IDS_FLAGS_OVERSCROLL_HISTORY_NAVIGATION_SIMPLE_UI,
+     switches::kOverscrollHistoryNavigation, "2"}};
 
 const FeatureEntry::Choice kOverscrollStartThresholdChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_OVERSCROLL_START_THRESHOLD_133_PERCENT,
-    switches::kOverscrollStartThreshold,
-    "133" },
-  { IDS_OVERSCROLL_START_THRESHOLD_166_PERCENT,
-    switches::kOverscrollStartThreshold,
-    "166" },
-  { IDS_OVERSCROLL_START_THRESHOLD_200_PERCENT,
-    switches::kOverscrollStartThreshold,
-    "200" }
-};
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+    {IDS_FLAGS_OVERSCROLL_START_THRESHOLD_133_PERCENT,
+     switches::kOverscrollStartThreshold, "133"},
+    {IDS_FLAGS_OVERSCROLL_START_THRESHOLD_166_PERCENT,
+     switches::kOverscrollStartThreshold, "166"},
+    {IDS_FLAGS_OVERSCROLL_START_THRESHOLD_200_PERCENT,
+     switches::kOverscrollStartThreshold, "200"}};
 #endif  // USE_AURA
 
 const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_TOUCH_SELECTION_STRATEGY_CHARACTER,
-    switches::kTouchTextSelectionStrategy,
-    "character" },
-  { IDS_TOUCH_SELECTION_STRATEGY_DIRECTION,
-    switches::kTouchTextSelectionStrategy,
-    "direction" }
-};
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
+    {IDS_FLAGS_TOUCH_SELECTION_STRATEGY_CHARACTER,
+     switches::kTouchTextSelectionStrategy, "character"},
+    {IDS_FLAGS_TOUCH_SELECTION_STRATEGY_DIRECTION,
+     switches::kTouchTextSelectionStrategy, "direction"}};
 
 const FeatureEntry::Choice kTraceUploadURL[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", "" },
-  { IDS_TRACE_UPLOAD_URL_CHOICE_OTHER, switches::kTraceUploadURL,
-    "https://performance-insights.appspot.com/upload?tags=flags,Other"},
-  { IDS_TRACE_UPLOAD_URL_CHOICE_EMLOADING, switches::kTraceUploadURL,
-    "https://performance-insights.appspot.com/upload?tags=flags,emloading" },
-  { IDS_TRACE_UPLOAD_URL_CHOICE_QA, switches::kTraceUploadURL,
-    "https://performance-insights.appspot.com/upload?tags=flags,QA" },
-  { IDS_TRACE_UPLOAD_URL_CHOICE_TESTING, switches::kTraceUploadURL,
-    "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam" }
-};
+    {IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, "", ""},
+    {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_OTHER, switches::kTraceUploadURL,
+     "https://performance-insights.appspot.com/upload?tags=flags,Other"},
+    {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_EMLOADING, switches::kTraceUploadURL,
+     "https://performance-insights.appspot.com/upload?tags=flags,emloading"},
+    {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_QA, switches::kTraceUploadURL,
+     "https://performance-insights.appspot.com/upload?tags=flags,QA"},
+    {IDS_FLAGS_TRACE_UPLOAD_URL_CHOICE_TESTING, switches::kTraceUploadURL,
+     "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}};
 
 #if !defined(DISABLE_NACL)
 const FeatureEntry::Choice kNaClDebugMaskChoices[] = {
-  // Secure shell can be used on ChromeOS for forwarding the TCP port opened by
-  // debug stub to a remote machine. Since secure shell uses NaCl, we usually
-  // want to avoid debugging that. The PNaCl translator is also a NaCl module,
-  // so by default we want to avoid debugging that.
-  // NOTE: As the default value must be the empty string, the mask excluding
-  // the PNaCl translator and secure shell is substituted elsewhere.
-  { IDS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", "" },
-  { IDS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask, "*://*" },
-  { IDS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG,
-      switches::kNaClDebugMask, "*://*/*debug.nmf" }
-};
+    // Secure shell can be used on ChromeOS for forwarding the TCP port opened
+    // by
+    // debug stub to a remote machine. Since secure shell uses NaCl, we usually
+    // want to avoid debugging that. The PNaCl translator is also a NaCl module,
+    // so by default we want to avoid debugging that.
+    // NOTE: As the default value must be the empty string, the mask excluding
+    // the PNaCl translator and secure shell is substituted elsewhere.
+    {IDS_FLAGS_NACL_DEBUG_MASK_CHOICE_EXCLUDE_UTILS_PNACL, "", ""},
+    {IDS_FLAGS_NACL_DEBUG_MASK_CHOICE_DEBUG_ALL, switches::kNaClDebugMask,
+     "*://*"},
+    {IDS_FLAGS_NACL_DEBUG_MASK_CHOICE_INCLUDE_DEBUG, switches::kNaClDebugMask,
+     "*://*/*debug.nmf"}};
 #endif  // DISABLE_NACL
 
 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 kMarkHttpAsChoices[] = {
     {IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", ""},
-    {IDS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs,
+    {IDS_FLAGS_MARK_HTTP_AS_DANGEROUS, security_state::switches::kMarkHttpAs,
      security_state::switches::kMarkHttpAsDangerous}};
 
 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::
@@ skipping 746 matching lines @@
      SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)},
 #endif  // ENABLE_EXTENSIONS
     {"enable-devtools-experiments", IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME,
      IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION, kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)},
     {"silent-debugger-extension-api",
      IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_NAME,
      IDS_FLAGS_SILENT_DEBUGGER_EXTENSION_API_DESCRIPTION, kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kSilentDebuggerExtensionAPI)},
 #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_ANDROID)
-    {"enable-android-spellchecker", IDS_OPTIONS_ENABLE_SPELLCHECK,
-     IDS_OPTIONS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid,
+    {"enable-android-spellchecker", IDS_FLAGS_ENABLE_ANDROID_SPELLCHECKER_NAME,
+     IDS_FLAGS_ENABLE_ANDROID_SPELLCHECKER_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(spellcheck::kAndroidSpellCheckerNonLowEnd)},
 #endif  // ENABLE_SPELLCHECK && OS_ANDROID
     {"enable-scroll-prediction", IDS_FLAGS_SCROLL_PREDICTION_NAME,
      IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION, kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)},
     {"top-chrome-md", IDS_FLAGS_TOP_CHROME_MD,
      IDS_FLAGS_TOP_CHROME_MD_DESCRIPTION, kOsDesktop,
      MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
     {"enable-site-settings", IDS_FLAGS_SITE_SETTINGS,
      IDS_FLAGS_SITE_SETTINGS_DESCRIPTION, kOsDesktop,
@@ skipping 410 matching lines @@
 #endif  // OS_MACOSX
 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
     {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME,
      IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux,
      FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
 #endif  // OS_LINUX || OS_WIN || OS_CHROMEOS
     {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME,
      IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
 #if defined(OS_MACOSX)
-    {"enable-native-notifications", IDS_NOTIFICATIONS_NATIVE_FLAG,
-     IDS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac,
+    {"enable-native-notifications", IDS_FLAGS_NOTIFICATIONS_NATIVE_FLAG,
+     IDS_FLAGS_NOTIFICATIONS_NATIVE_FLAG_DESCRIPTION, kOsMac,
      FEATURE_VALUE_TYPE(features::kNativeNotifications)},
 #endif  // OS_MACOSX
 #if defined(TOOLKIT_VIEWS)
     {"disable-views-rect-based-targeting",
      IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME,
      IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION,
      kOsCrOS | kOsWin | kOsLinux,
      SINGLE_DISABLE_VALUE_TYPE(
          views::switches::kDisableViewsRectBasedTargeting)},
 #endif  // TOOLKIT_VIEWS
@@ skipping 128 matching lines @@
 #endif  // OS_ANDROID
 #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  // OS_CHROMEOS
-    {"mark-non-secure-as", IDS_MARK_HTTP_AS_NAME, IDS_MARK_HTTP_AS_DESCRIPTION,
-     kOsAll, MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
-    {"enable-http-form-warning", IDS_ENABLE_HTTP_FORM_WARNING_NAME,
-     IDS_ENABLE_HTTP_FORM_WARNING_DESCRIPTION, kOsAll,
+    {"mark-non-secure-as", IDS_FLAGS_MARK_HTTP_AS_NAME,
+     IDS_FLAGS_MARK_HTTP_AS_DESCRIPTION, kOsAll,
+     MULTI_VALUE_TYPE(kMarkHttpAsChoices)},
+    {"enable-http-form-warning", IDS_FLAGS_ENABLE_HTTP_FORM_WARNING_NAME,
+     IDS_FLAGS_ENABLE_HTTP_FORM_WARNING_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(security_state::kHttpFormWarningFeature)},
     {"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)},
@@ skipping 11 matching lines @@
      SINGLE_VALUE_TYPE(
          data_reduction_proxy::switches::kEnableDataReductionProxyLitePage)},
 #if defined(OS_ANDROID)
     {"enable-data-reduction-proxy-savings-promo",
      IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_SAVINGS_PROMO_NAME,
      IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_SAVINGS_PROMO_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
                            kEnableDataReductionProxySavingsPromo)},
 #endif  // OS_ANDROID
-    {"allow-insecure-localhost", IDS_ALLOW_INSECURE_LOCALHOST,
-     IDS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll,
+    {"allow-insecure-localhost", IDS_FLAGS_ALLOW_INSECURE_LOCALHOST,
+     IDS_FLAGS_ALLOW_INSECURE_LOCALHOST_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)},
     {"enable-add-to-shelf", IDS_FLAGS_ADD_TO_SHELF_NAME,
      IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION, kOsDesktop,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAddToShelf,
                                switches::kDisableAddToShelf)},
     {"bypass-app-banner-engagement-checks",
      IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_NAME,
      IDS_FLAGS_BYPASS_APP_BANNER_ENGAGEMENT_CHECKS_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kBypassAppBannerEngagementChecks)},
     {"use-sync-sandbox", IDS_FLAGS_SYNC_SANDBOX_NAME,
@@ skipping 279 matching lines @@
     {"ssl-version-max", IDS_FLAGS_SSL_VERSION_MAX_NAME,
      IDS_FLAGS_SSL_VERSION_MAX_DESCRIPTION, kOsAll,
      MULTI_VALUE_TYPE(kSSLVersionMaxChoices)},
     {"enable-token-binding", IDS_FLAGS_ENABLE_TOKEN_BINDING_NAME,
      IDS_FLAGS_ENABLE_TOKEN_BINDING_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kTokenBinding)},
     {"enable-scroll-anchoring", IDS_FLAGS_ENABLE_SCROLL_ANCHORING_NAME,
      IDS_FLAGS_ENABLE_SCROLL_ANCHORING_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(features::kScrollAnchoring)},
     {"disable-audio-support-for-desktop-share",
-     IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
-     IDS_FLAG_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
+     IDS_FLAGS_DISABLE_AUDIO_FOR_DESKTOP_SHARE,
+     IDS_FLAGS_DISABLE_AUDIO_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(switches::kDisableAudioSupportForDesktopShare)},
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-    {"tab-for-desktop-share", IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE,
-     IDS_FLAG_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
+    {"tab-for-desktop-share", IDS_FLAGS_DISABLE_TAB_FOR_DESKTOP_SHARE,
+     IDS_FLAGS_DISABLE_TAB_FOR_DESKTOP_SHARE_DESCRIPTION, kOsAll,
      SINGLE_VALUE_TYPE(extensions::switches::kDisableTabForDesktopShare)},
 #endif  // ENABLE_EXTENSIONS
 #if defined(OS_ANDROID)
     {"content-suggestions-category-order",
      IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_ORDER_NAME,
      IDS_FLAGS_CONTENT_SUGGESTIONS_CATEGORY_ORDER_DESCRIPTION, kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          ntp_snippets::kCategoryOrder,
          kContentSuggestionsCategoryOrderFeatureVariations,
          ntp_snippets::kStudyName)},
@@ skipping 180 matching lines @@
      FEATURE_VALUE_TYPE(chrome::android::kAndroidPaymentApps)},
     {"android-payment-apps-filter", IDS_FLAGS_ANDROID_PAYMENT_APPS_FILTER_TITLE,
      IDS_FLAGS_ANDROID_PAYMENT_APPS_FILTER_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kAndroidPaymentAppsFilter)},
 #endif  // OS_ANDROID
 #if defined(OS_CHROMEOS)
     {"disable-eol-notification", IDS_FLAGS_EOL_NOTIFICATION_NAME,
      IDS_FLAGS_EOL_NOTIFICATION_DESCRIPTION, kOsCrOS,
      SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableEolNotification)},
 #endif  // OS_CHROMEOS
-    {"fill-on-account-select", IDS_FILL_ON_ACCOUNT_SELECT_NAME,
-     IDS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll,
+    {"fill-on-account-select", IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_NAME,
+     IDS_FLAGS_FILL_ON_ACCOUNT_SELECT_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(password_manager::features::kFillOnAccountSelect)},
     {"new-audio-rendering-mixing-strategy",
-     IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME,
-     IDS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION,
+     IDS_FLAGS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_NAME,
+     IDS_FLAGS_NEW_AUDIO_RENDERING_MIXING_STRATEGY_DESCRIPTION,
      kOsWin | kOsMac | kOsLinux | kOsAndroid,
      FEATURE_VALUE_TYPE(media::kNewAudioRenderingMixingStrategy)},
     {"disable-background-video-track",
-     IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
-     IDS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
+     IDS_FLAGS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_NAME,
+     IDS_FLAGS_BACKGROUND_VIDEO_TRACK_OPTIMIZATION_DESCRIPTION, kOsAll,
      FEATURE_VALUE_TYPE(media::kBackgroundVideoTrackOptimization)},
 #if defined(OS_CHROMEOS)
     {"quick-unlock-pin", IDS_FLAGS_QUICK_UNLOCK_PIN,
      IDS_FLAGS_QUICK_UNLOCK_PIN_DESCRIPTION, kOsCrOS,
      FEATURE_VALUE_TYPE(features::kQuickUnlockPin)},
     {"quick-unlock-fingerprint", IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT,
      IDS_FLAGS_QUICK_UNLOCK_FINGERPRINT_DESCRIPTION, kOsCrOS,
      FEATURE_VALUE_TYPE(features::kQuickUnlockFingerprint)},
 #endif  // OS_CHROMEOS
     {"browser-task-scheduler", IDS_FLAGS_BROWSER_TASK_SCHEDULER_NAME,
@@ skipping 125 matching lines @@
 
 #if defined(OS_ANDROID)
     {"enable-expanded-autofill-credit-card-popup",
      IDS_FLAGS_ENABLE_EXPANDED_AUTOFILL_CREDIT_CARD_POPUP_LAYOUT,
      IDS_FLAGS_ENABLE_EXPANDED_AUTOFILL_CREDIT_CARD_POPUP_LAYOUT_DESCRIPTION,
      kOsAndroid,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          autofill::kAutofillCreditCardPopupLayout,
          kAutofillCreditCardPopupLayoutFeatureVariations,
          "AutofillCreditCardPopupLayout")},
-    {"native-android-history-manager", IDS_NATIVE_ANDROID_HISTORY_MANAGER,
-     IDS_NATIVE_ANDROID_HISTORY_MANAGER_DESCRIPTION, kOsAndroid,
+    {"native-android-history-manager", IDS_FLAGS_NATIVE_ANDROID_HISTORY_MANAGER,
+     IDS_FLAGS_NATIVE_ANDROID_HISTORY_MANAGER_DESCRIPTION, kOsAndroid,
      FEATURE_VALUE_TYPE(features::kNativeAndroidHistoryManager)},
 #endif  // OS_ANDROID
     {"enable-autofill-credit-card-last-used-date-display",
      IDS_FLAGS_ENABLE_AUTOFILL_CREDIT_CARD_LAST_USED_DATE_DISPLAY,
      IDS_FLAGS_ENABLE_AUTOFILL_CREDIT_CARD_LAST_USED_DATE_DISPLAY_DESCRIPTION,
      kOsAll,
      FEATURE_WITH_PARAMS_VALUE_TYPE(
          autofill::kAutofillCreditCardLastUsedDateDisplay,
          kAutofillCreditCardLastUsedDateFeatureVariations,
          "AutofillCreditCardLastUsedDate")},
@@ skipping 334 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags