Use SINGLE_DISABLE_VALUE_TYPE for disable flags and update flag names.

Uses disable type flags to make the link to turn off default enabled experiments
say "Disable". Also updates enable flag titles to be consistent and not imply
enable or disable.

See screenshot in bug for the difference.

BUG=245319
TEST=Visual, see flags on chrome://flags

Review URL: https://codereview.chromium.org/1206323003

Cr-Commit-Position: refs/heads/master@{#361573}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0f611a92..b8b039e 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -557,24 +557,24 @@
      SINGLE_VALUE_TYPE(switches::kIgnoreGpuBlacklist)},
 #if defined(OS_WIN)
     {"disable-direct-write",
-     IDS_FLAGS_DISABLE_DIRECT_WRITE_NAME,
-     IDS_FLAGS_DISABLE_DIRECT_WRITE_DESCRIPTION,
+     IDS_FLAGS_DIRECT_WRITE_NAME,
+     IDS_FLAGS_DIRECT_WRITE_DESCRIPTION,
      kOsWin,
-     SINGLE_VALUE_TYPE(switches::kDisableDirectWrite)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableDirectWrite)},
 #endif
     {"enable-experimental-canvas-features",
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_NAME,
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION,
+     IDS_FLAGS_EXPERIMENTAL_CANVAS_FEATURES_NAME,
+     IDS_FLAGS_EXPERIMENTAL_CANVAS_FEATURES_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableExperimentalCanvasFeatures)},
     {"disable-accelerated-2d-canvas",
-     IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_NAME,
-     IDS_FLAGS_DISABLE_ACCELERATED_2D_CANVAS_DESCRIPTION,
+     IDS_FLAGS_ACCELERATED_2D_CANVAS_NAME,
+     IDS_FLAGS_ACCELERATED_2D_CANVAS_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)},
     {"enable-display-list-2d-canvas",
-     IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_NAME,
-     IDS_FLAGS_ENABLE_DISPLAY_LIST_2D_CANVAS_DESCRIPTION,
+     IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_NAME,
+     IDS_FLAGS_DISPLAY_LIST_2D_CANVAS_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDisplayList2dCanvas,
                                switches::kDisableDisplayList2dCanvas)},
@@ -590,38 +590,38 @@
      SINGLE_VALUE_TYPE(cc::switches::kShowFPSCounter)},
 #if defined(ENABLE_WEBRTC)
     {"disable-webrtc-hw-decoding",
-     IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_NAME,
-     IDS_FLAGS_DISABLE_WEBRTC_HW_DECODING_DESCRIPTION,
+     IDS_FLAGS_WEBRTC_HW_DECODING_NAME,
+     IDS_FLAGS_WEBRTC_HW_DECODING_DESCRIPTION,
      kOsAndroid | kOsCrOS,
-     SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWDecoding)},
     {"disable-webrtc-hw-encoding",
-     IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_NAME,
-     IDS_FLAGS_DISABLE_WEBRTC_HW_ENCODING_DESCRIPTION,
+     IDS_FLAGS_WEBRTC_HW_ENCODING_NAME,
+     IDS_FLAGS_WEBRTC_HW_ENCODING_DESCRIPTION,
      kOsAndroid | kOsCrOS,
-     SINGLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebRtcHWEncoding)},
     {"enable-webrtc-stun-origin",
-     IDS_FLAGS_ENABLE_WEBRTC_STUN_ORIGIN_NAME,
-     IDS_FLAGS_ENABLE_WEBRTC_STUN_ORIGIN_DESCRIPTION,
+     IDS_FLAGS_WEBRTC_STUN_ORIGIN_NAME,
+     IDS_FLAGS_WEBRTC_STUN_ORIGIN_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebRtcStunOrigin)},
 #endif
 #if defined(OS_ANDROID)
     {"disable-webaudio",
-     IDS_FLAGS_DISABLE_WEBAUDIO_NAME,
-     IDS_FLAGS_DISABLE_WEBAUDIO_DESCRIPTION,
+     IDS_FLAGS_WEBAUDIO_NAME,
+     IDS_FLAGS_WEBAUDIO_DESCRIPTION,
      kOsAndroid,
-     SINGLE_VALUE_TYPE(switches::kDisableWebAudio)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableWebAudio)},
 #endif
   // Native client is compiled out when DISABLE_NACL is defined.
 #if !defined(DISABLE_NACL)
     {"enable-nacl",  // FLAGS:RECORD_UMA
-     IDS_FLAGS_ENABLE_NACL_NAME,
-     IDS_FLAGS_ENABLE_NACL_DESCRIPTION,
+     IDS_FLAGS_NACL_NAME,
+     IDS_FLAGS_NACL_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableNaCl)},
     {"enable-nacl-debug",  // FLAGS:RECORD_UMA
-     IDS_FLAGS_ENABLE_NACL_DEBUG_NAME,
-     IDS_FLAGS_ENABLE_NACL_DEBUG_DESCRIPTION,
+     IDS_FLAGS_NACL_DEBUG_NAME,
+     IDS_FLAGS_NACL_DEBUG_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableNaClDebug)},
     {"nacl-debug-mask",  // FLAGS:RECORD_UMA
@@ -643,26 +643,26 @@
      SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
 #endif
     {"enable-fast-unload",
-     IDS_FLAGS_ENABLE_FAST_UNLOAD_NAME,
-     IDS_FLAGS_ENABLE_FAST_UNLOAD_DESCRIPTION,
+     IDS_FLAGS_FAST_UNLOAD_NAME,
+     IDS_FLAGS_FAST_UNLOAD_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableFastUnload)},
 #if defined(ENABLE_EXTENSIONS)
     {"enable-app-window-controls",
-     IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_NAME,
-     IDS_FLAGS_ENABLE_APP_WINDOW_CONTROLS_DESCRIPTION,
+     IDS_FLAGS_APP_WINDOW_CONTROLS_NAME,
+     IDS_FLAGS_APP_WINDOW_CONTROLS_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(extensions::switches::kEnableAppWindowControls)},
 #endif
     {"disable-hyperlink-auditing",
-     IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_NAME,
-     IDS_FLAGS_DISABLE_HYPERLINK_AUDITING_DESCRIPTION,
+     IDS_FLAGS_HYPERLINK_AUDITING_NAME,
+     IDS_FLAGS_HYPERLINK_AUDITING_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kNoPings)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kNoPings)},
 #if defined(OS_ANDROID)
     {"contextual-search",
-     IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH,
-     IDS_FLAGS_ENABLE_CONTEXTUAL_SEARCH_DESCRIPTION,
+     IDS_FLAGS_CONTEXTUAL_SEARCH,
+     IDS_FLAGS_CONTEXTUAL_SEARCH_DESCRIPTION,
      kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableContextualSearch,
                                switches::kDisableContextualSearch)},
@@ -673,16 +673,16 @@
      kOsAll,
      SINGLE_VALUE_TYPE(autofill::switches::kShowAutofillTypePredictions)},
     {"enable-smooth-scrolling",  // FLAGS:RECORD_UMA
-     IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_NAME,
-     IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION,
+     IDS_FLAGS_SMOOTH_SCROLLING_NAME,
+     IDS_FLAGS_SMOOTH_SCROLLING_DESCRIPTION,
      // Can't expose the switch unless the code is compiled in.
      // On by default for the Mac (different implementation in WebKit).
      kOsLinux | kOsWin,
      SINGLE_VALUE_TYPE(switches::kEnableSmoothScrolling)},
 #if defined(USE_AURA) || defined(OS_LINUX)
     {"overlay-scrollbars",
-     IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_NAME,
-     IDS_FLAGS_ENABLE_OVERLAY_SCROLLBARS_DESCRIPTION,
+     IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
+     IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
      // Uses the system preference on Mac (a different implementation).
      // On Android, this is always enabled.
      kOsLinux | kOsCrOS | kOsWin,
@@ -690,8 +690,8 @@
                                switches::kDisableOverlayScrollbar)},
 #endif
     {"enable-panels",
-     IDS_FLAGS_ENABLE_PANELS_NAME,
-     IDS_FLAGS_ENABLE_PANELS_DESCRIPTION,
+     IDS_FLAGS_PANELS_NAME,
+     IDS_FLAGS_PANELS_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnablePanels)},
     {// See http://crbug.com/120416 for how to remove this flag.
@@ -701,52 +701,52 @@
      kOsMac | kOsWin | kOsLinux,
      SINGLE_VALUE_TYPE(switches::kSavePageAsMHTML)},
     {"enable-quic",
-     IDS_FLAGS_ENABLE_QUIC_NAME,
-     IDS_FLAGS_ENABLE_QUIC_DESCRIPTION,
+     IDS_FLAGS_QUIC_NAME,
+     IDS_FLAGS_QUIC_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableQuic, switches::kDisableQuic)},
     {"enable-alternative-services",
-     IDS_FLAGS_ENABLE_ALTSVC_NAME,
-     IDS_FLAGS_ENABLE_ALTSVC_DESCRIPTION,
+     IDS_FLAGS_ALTSVC_NAME,
+     IDS_FLAGS_ALTSVC_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableAlternativeServices)},
     {"disable-media-source",
-     IDS_FLAGS_DISABLE_MEDIA_SOURCE_NAME,
-     IDS_FLAGS_DISABLE_MEDIA_SOURCE_DESCRIPTION,
+     IDS_FLAGS_MEDIA_SOURCE_NAME,
+     IDS_FLAGS_MEDIA_SOURCE_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableMediaSource)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableMediaSource)},
     {"disable-encrypted-media",
-     IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_NAME,
-     IDS_FLAGS_DISABLE_ENCRYPTED_MEDIA_DESCRIPTION,
+     IDS_FLAGS_ENCRYPTED_MEDIA_NAME,
+     IDS_FLAGS_ENCRYPTED_MEDIA_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableEncryptedMedia)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableEncryptedMedia)},
     {"enable-prefixed-encrypted-media",
-     IDS_FLAGS_ENABLE_PREFIXED_ENCRYPTED_MEDIA_NAME,
-     IDS_FLAGS_ENABLE_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
+     IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_NAME,
+     IDS_FLAGS_PREFIXED_ENCRYPTED_MEDIA_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnablePrefixedEncryptedMedia)},
     {"disable-javascript-harmony-shipping",
-     IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_NAME,
-     IDS_FLAGS_DISABLE_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION,
+     IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_NAME,
+     IDS_FLAGS_JAVASCRIPT_HARMONY_SHIPPING_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableJavaScriptHarmonyShipping)},
     {"enable-javascript-harmony",
-     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_NAME,
-     IDS_FLAGS_ENABLE_JAVASCRIPT_HARMONY_DESCRIPTION,
+     IDS_FLAGS_JAVASCRIPT_HARMONY_NAME,
+     IDS_FLAGS_JAVASCRIPT_HARMONY_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kJavaScriptHarmony)},
     {"disable-software-rasterizer",
-     IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME,
-     IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION,
+     IDS_FLAGS_SOFTWARE_RASTERIZER_NAME,
+     IDS_FLAGS_SOFTWARE_RASTERIZER_DESCRIPTION,
 #if defined(ENABLE_SWIFTSHADER)
      kOsAll,
 #else
      0,
 #endif
-     SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)},
     {"enable-gpu-rasterization",
-     IDS_FLAGS_ENABLE_GPU_RASTERIZATION_NAME,
-     IDS_FLAGS_ENABLE_GPU_RASTERIZATION_DESCRIPTION,
+     IDS_FLAGS_GPU_RASTERIZATION_NAME,
+     IDS_FLAGS_GPU_RASTERIZATION_DESCRIPTION,
      kOsAll,
      MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)},
     {"gpu-rasterization-msaa-sample-count",
@@ -777,8 +777,8 @@
      SINGLE_VALUE_TYPE(extensions::switches::kEnableBLEAdvertising)},
 #endif
     {"enable-devtools-experiments",
-     IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_NAME,
-     IDS_FLAGS_ENABLE_DEVTOOLS_EXPERIMENTS_DESCRIPTION,
+     IDS_FLAGS_DEVTOOLS_EXPERIMENTS_NAME,
+     IDS_FLAGS_DEVTOOLS_EXPERIMENTS_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableDevToolsExperiments)},
     {"silent-debugger-extension-api",
@@ -810,8 +810,8 @@
                                switches::kDisableMultilingualSpellChecker)},
 #endif
     {"enable-scroll-prediction",
-     IDS_FLAGS_ENABLE_SCROLL_PREDICTION_NAME,
-     IDS_FLAGS_ENABLE_SCROLL_PREDICTION_DESCRIPTION,
+     IDS_FLAGS_SCROLL_PREDICTION_NAME,
+     IDS_FLAGS_SCROLL_PREDICTION_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableScrollPrediction)},
 #if defined(ENABLE_TOPCHROME_MD)
@@ -822,15 +822,15 @@
      MULTI_VALUE_TYPE(kTopChromeMaterialDesignChoices)},
 #endif
     {"touch-events",
-     IDS_TOUCH_EVENTS_NAME,
-     IDS_TOUCH_EVENTS_DESCRIPTION,
+     IDS_FLAGS_TOUCH_EVENTS_NAME,
+     IDS_FLAGS_TOUCH_EVENTS_DESCRIPTION,
      kOsDesktop,
      MULTI_VALUE_TYPE(kTouchEventsChoices)},
     {"disable-touch-adjustment",
-     IDS_DISABLE_TOUCH_ADJUSTMENT_NAME,
-     IDS_DISABLE_TOUCH_ADJUSTMENT_DESCRIPTION,
+     IDS_FLAGS_TOUCH_ADJUSTMENT_NAME,
+     IDS_FLAGS_TOUCH_ADJUSTMENT_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsAndroid,
-     SINGLE_VALUE_TYPE(switches::kDisableTouchAdjustment)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchAdjustment)},
 #if defined(OS_CHROMEOS)
     {"network-portal-notification",
      IDS_FLAGS_NETWORK_PORTAL_NOTIFICATION_NAME,
@@ -841,14 +841,14 @@
          chromeos::switches::kDisableNetworkPortalNotification)},
 #endif
     {"enable-download-resumption",
-     IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_NAME,
-     IDS_FLAGS_ENABLE_DOWNLOAD_RESUMPTION_DESCRIPTION,
+     IDS_FLAGS_DOWNLOAD_RESUMPTION_NAME,
+     IDS_FLAGS_DOWNLOAD_RESUMPTION_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)},
 #if defined(OS_CHROMEOS)
     {"enable-download-notification",
-     IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_NAME,
-     IDS_FLAGS_ENABLE_DOWNLOAD_NOTIFICATION_DESCRIPTION,
+     IDS_FLAGS_DOWNLOAD_NOTIFICATION_NAME,
+     IDS_FLAGS_DOWNLOAD_NOTIFICATION_DESCRIPTION,
      kOsCrOS,
      MULTI_VALUE_TYPE(kDownloadNotificationChoices)},
 #endif
@@ -871,23 +871,24 @@
      kOsCrOS,
      SINGLE_VALUE_TYPE(ash::switches::kAshEnableUnifiedDesktop)},
     {"enable-easy-unlock-proximity-detection",
-     IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_NAME,
-     IDS_FLAGS_ENABLE_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION,
+     IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_NAME,
+     IDS_FLAGS_EASY_UNLOCK_PROXIMITY_DETECTION_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(proximity_auth::switches::kEnableProximityDetection)},
     {"enable-easy-unlock-bluetooth-low-energy-detection",
-     IDS_FLAGS_ENABLE_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME,
-     IDS_FLAGS_ENABLE_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION,
+     IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_NAME,
+     IDS_FLAGS_EASY_UNLOCK_BLUETOOTH_LOW_ENERGY_DISCOVERY_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(
          proximity_auth::switches::kEnableBluetoothLowEnergyDiscovery)},
 #endif
 #if defined(USE_ASH)
     {"disable-minimize-on-second-launcher-item-click",
-     IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME,
-     IDS_FLAGS_DISABLE_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION,
+     IDS_FLAGS_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_NAME,
+     IDS_FLAGS_MINIMIZE_ON_SECOND_LAUNCHER_ITEM_CLICK_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableMinimizeOnSecondLauncherItemClick)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         switches::kDisableMinimizeOnSecondLauncherItemClick)},
     {"show-touch-hud",
      IDS_FLAGS_SHOW_TOUCH_HUD_NAME,
      IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION,
@@ -895,8 +896,8 @@
      SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
     {
      "enable-pinch",
-     IDS_FLAGS_ENABLE_PINCH_SCALE_NAME,
-     IDS_FLAGS_ENABLE_PINCH_SCALE_DESCRIPTION,
+     IDS_FLAGS_PINCH_SCALE_NAME,
+     IDS_FLAGS_PINCH_SCALE_DESCRIPTION,
      kOsLinux | kOsWin | kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePinch, switches::kDisablePinch),
     },
@@ -904,45 +905,46 @@
 #if defined(OS_CHROMEOS)
     {
      "disable-boot-animation",
-     IDS_FLAGS_DISABLE_BOOT_ANIMATION,
-     IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION,
+     IDS_FLAGS_BOOT_ANIMATION,
+     IDS_FLAGS_BOOT_ANIMATION_DESCRIPTION,
      kOsCrOSOwnerOnly,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
+     SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
     },
     {"enable-video-player-chromecast-support",
-     IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME,
-     IDS_FLAGS_ENABLE_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION,
+     IDS_FLAGS_VIDEO_PLAYER_CHROMECAST_SUPPORT_NAME,
+     IDS_FLAGS_VIDEO_PLAYER_CHROMECAST_SUPPORT_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(
          chromeos::switches::kEnableVideoPlayerChromecastSupport)},
     {
      "disable-office-editing-component-app",
-     IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME,
-     IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION,
+     IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_NAME,
+     IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp),
+     SINGLE_DISABLE_VALUE_TYPE(
+         chromeos::switches::kDisableOfficeEditingComponentApp),
     },
     {
      "disable-display-color-calibration",
-     IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME,
-     IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_DESCRIPTION,
+     IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_NAME,
+     IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration),
+     SINGLE_DISABLE_VALUE_TYPE(ui::switches::kDisableDisplayColorCalibration),
     },
     {
      "ash-disable-screen-orientation-lock",
-     IDS_FLAGS_ASH_DISABLE_SCREEN_ORIENTATION_LOCK_NAME,
-     IDS_FLAGS_ASH_DISABLE_SCREEN_ORIENTATION_LOCK_DESCRIPTION,
+     IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_NAME,
+     IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(ash::switches::kAshDisableScreenOrientationLock),
+     SINGLE_DISABLE_VALUE_TYPE(ash::switches::kAshDisableScreenOrientationLock),
     },
 #endif  // defined(OS_CHROMEOS)
     {
      "disable-accelerated-video-decode",
-     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_NAME,
-     IDS_FLAGS_DISABLE_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
+     IDS_FLAGS_ACCELERATED_VIDEO_DECODE_NAME,
+     IDS_FLAGS_ACCELERATED_VIDEO_DECODE_DESCRIPTION,
      kOsMac | kOsWin | kOsCrOS,
-     SINGLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
     },
 #if defined(USE_ASH)
     {
@@ -954,10 +956,11 @@
     },
     {
      "ash-disable-maximize-mode-window-backdrop",
-     IDS_FLAGS_ASH_DISABLE_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME,
-     IDS_FLAGS_ASH_DISABLE_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION,
+     IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_NAME,
+     IDS_FLAGS_ASH_MAXIMIZE_MODE_WINDOW_BACKDROP_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(ash::switches::kAshDisableMaximizeModeWindowBackdrop),
+     SINGLE_DISABLE_VALUE_TYPE(
+         ash::switches::kAshDisableMaximizeModeWindowBackdrop),
     },
     {
      "ash-enable-touch-view-testing",
@@ -968,10 +971,10 @@
     },
     {
      "disable-touch-feedback",
-     IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_NAME,
-     IDS_FLAGS_DISABLE_TOUCH_FEEDBACK_DESCRIPTION,
+     IDS_FLAGS_TOUCH_FEEDBACK_NAME,
+     IDS_FLAGS_TOUCH_FEEDBACK_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(switches::kDisableTouchFeedback),
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableTouchFeedback),
     },
     {
      "ash-enable-mirrored-screen",
@@ -996,13 +999,13 @@
      kOsCrOS,
      MULTI_VALUE_TYPE(kAshMaterialDesignInkDropAnimationSpeed)},
     {"disable-cloud-import",
-     IDS_FLAGS_DISABLE_CLOUD_IMPORT,
-     IDS_FLAGS_DISABLE_CLOUD_IMPORT_DESCRIPTION,
+     IDS_FLAGS_CLOUD_IMPORT,
+     IDS_FLAGS_CLOUD_IMPORT_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)},
+     SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableCloudImport)},
     {"enable-request-tablet-site",
-     IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_NAME,
-     IDS_FLAGS_ENABLE_REQUEST_TABLET_SITE_DESCRIPTION,
+     IDS_FLAGS_REQUEST_TABLET_SITE_NAME,
+     IDS_FLAGS_REQUEST_TABLET_SITE_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kEnableRequestTabletSite)},
 #endif
@@ -1012,14 +1015,14 @@
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kDebugPackedApps)},
     {"enable-password-generation",
-     IDS_FLAGS_ENABLE_PASSWORD_GENERATION_NAME,
-     IDS_FLAGS_ENABLE_PASSWORD_GENERATION_DESCRIPTION,
+     IDS_FLAGS_PASSWORD_GENERATION_NAME,
+     IDS_FLAGS_PASSWORD_GENERATION_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnablePasswordGeneration,
                                autofill::switches::kDisablePasswordGeneration)},
     {"enable-automatic-password-saving",
-     IDS_FLAGS_ENABLE_AUTOMATIC_PASSWORD_SAVING_NAME,
-     IDS_FLAGS_ENABLE_AUTOMATIC_PASSWORD_SAVING_DESCRIPTION,
+     IDS_FLAGS_AUTOMATIC_PASSWORD_SAVING_NAME,
+     IDS_FLAGS_AUTOMATIC_PASSWORD_SAVING_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(
          password_manager::switches::kEnableAutomaticPasswordSaving)},
@@ -1027,21 +1030,22 @@
      IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_NAME,
      IDS_FLAGS_PASSWORD_MANAGER_REAUTHENTICATION_DESCRIPTION,
      kOsMac | kOsWin,
-     SINGLE_VALUE_TYPE(switches::kDisablePasswordManagerReauthentication)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         switches::kDisablePasswordManagerReauthentication)},
     {"enable-password-change-support",
-     IDS_FLAGS_ENABLE_PASSWORD_CHANGE_SUPPORT_NAME,
-     IDS_FLAGS_ENABLE_PASSWORD_CHANGE_SUPPORT_DESCRIPTION,
+     IDS_FLAGS_PASSWORD_CHANGE_SUPPORT_NAME,
+     IDS_FLAGS_PASSWORD_CHANGE_SUPPORT_DESCRIPTION,
      kOsMac,
      SINGLE_VALUE_TYPE(
          password_manager::switches::kEnablePasswordChangeSupport)},
     {"enable-password-force-saving",
-     IDS_FLAGS_ENABLE_PASSWORD_FORCE_SAVING_NAME,
-     IDS_FLAGS_ENABLE_PASSWORD_FORCE_SAVING_DESCRIPTION,
+     IDS_FLAGS_PASSWORD_FORCE_SAVING_NAME,
+     IDS_FLAGS_PASSWORD_FORCE_SAVING_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(password_manager::switches::kEnablePasswordForceSaving)},
     {"enable-affiliation-based-matching",
-     IDS_FLAGS_ENABLE_AFFILIATION_BASED_MATCHING_NAME,
-     IDS_FLAGS_ENABLE_AFFILIATION_BASED_MATCHING_DESCRIPTION,
+     IDS_FLAGS_AFFILIATION_BASED_MATCHING_NAME,
+     IDS_FLAGS_AFFILIATION_BASED_MATCHING_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsMac | kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(
          password_manager::switches::kEnableAffiliationBasedMatching,
@@ -1071,14 +1075,14 @@
                                          switches::kScrollEndEffect,
                                          "0")},
     {"enable-icon-ntp",
-     IDS_FLAGS_ENABLE_ICON_NTP_NAME,
-     IDS_FLAGS_ENABLE_ICON_NTP_DESCRIPTION,
+     IDS_FLAGS_ICON_NTP_NAME,
+     IDS_FLAGS_ICON_NTP_DESCRIPTION,
      kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableIconNtp,
                                switches::kDisableIconNtp)},
     {"enable-touch-drag-drop",
-     IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_NAME,
-     IDS_FLAGS_ENABLE_TOUCH_DRAG_DROP_DESCRIPTION,
+     IDS_FLAGS_TOUCH_DRAG_DROP_NAME,
+     IDS_FLAGS_TOUCH_DRAG_DROP_DESCRIPTION,
      kOsWin | kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTouchDragDrop,
                                switches::kDisableTouchDragDrop)},
@@ -1098,28 +1102,28 @@
      kOsAll,
      MULTI_VALUE_TYPE(kTraceUploadURL)},
     {"enable-suggestions-with-substring-match",
-     IDS_FLAGS_ENABLE_SUGGESTIONS_WITH_SUB_STRING_MATCH_NAME,
-     IDS_FLAGS_ENABLE_SUGGESTIONS_WITH_SUB_STRING_MATCH_DESCRIPTION,
+     IDS_FLAGS_SUGGESTIONS_WITH_SUB_STRING_MATCH_NAME,
+     IDS_FLAGS_SUGGESTIONS_WITH_SUB_STRING_MATCH_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(
          autofill::switches::kEnableSuggestionsWithSubstringMatch)},
     {"enable-supervised-user-managed-bookmarks-folder",
-     IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME,
-     IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION,
+     IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME,
+     IDS_FLAGS_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION,
      kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder)},
 #if defined(ENABLE_APP_LIST)
     {"enable-sync-app-list",
-     IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME,
-     IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION,
+     IDS_FLAGS_SYNC_APP_LIST_NAME,
+     IDS_FLAGS_SYNC_APP_LIST_DESCRIPTION,
      kOsDesktop,
      ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableSyncAppList,
                                app_list::switches::kDisableSyncAppList)},
 #endif
 #if defined(OS_MACOSX)
     {"enable-avfoundation",
-     IDS_FLAGS_ENABLE_AVFOUNDATION_NAME,
-     IDS_FLAGS_ENABLE_AVFOUNDATION_DESCRIPTION,
+     IDS_FLAGS_AVFOUNDATION_NAME,
+     IDS_FLAGS_AVFOUNDATION_DESCRIPTION,
      kOsMac,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAVFoundation,
                                switches::kForceQTKit)},
@@ -1131,21 +1135,21 @@
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableLCDText,
                                switches::kDisableLCDText)},
     {"enable-offer-store-unmasked-wallet-cards",
-     IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS,
-     IDS_FLAGS_ENABLE_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION,
+     IDS_FLAGS_OFFER_STORE_UNMASKED_WALLET_CARDS,
+     IDS_FLAGS_OFFER_STORE_UNMASKED_WALLET_CARDS_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(
          autofill::switches::kEnableOfferStoreUnmaskedWalletCards,
          autofill::switches::kDisableOfferStoreUnmaskedWalletCards)},
     {"enable-offline-auto-reload",
-     IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_NAME,
-     IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_DESCRIPTION,
+     IDS_FLAGS_OFFLINE_AUTO_RELOAD_NAME,
+     IDS_FLAGS_OFFLINE_AUTO_RELOAD_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReload,
                                switches::kDisableOfflineAutoReload)},
     {"enable-offline-auto-reload-visible-only",
-     IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME,
-     IDS_FLAGS_ENABLE_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION,
+     IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_NAME,
+     IDS_FLAGS_OFFLINE_AUTO_RELOAD_VISIBLE_ONLY_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableOfflineAutoReloadVisibleOnly,
                                switches::kDisableOfflineAutoReloadVisibleOnly)},
@@ -1165,49 +1169,50 @@
      kOsAll,
      MULTI_VALUE_TYPE(kDefaultTileHeightChoices)},
     {"disable-gesture-requirement-for-media-playback",
-     IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME,
-     IDS_FLAGS_DISABLE_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION,
+     IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_NAME,
+     IDS_FLAGS_GESTURE_REQUIREMENT_FOR_MEDIA_PLAYBACK_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableGestureRequirementForMediaPlayback)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         switches::kDisableGestureRequirementForMediaPlayback)},
 #if defined(OS_CHROMEOS)
     {"enable-virtual-keyboard",
-     IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_NAME,
-     IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_DESCRIPTION,
+     IDS_FLAGS_VIRTUAL_KEYBOARD_NAME,
+     IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)},
     {"enable-virtual-keyboard-overscroll",
-     IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_OVERSCROLL_NAME,
-     IDS_FLAGS_ENABLE_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION,
+     IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME,
+     IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION,
      kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(
          keyboard::switches::kEnableVirtualKeyboardOverscroll,
          keyboard::switches::kDisableVirtualKeyboardOverscroll)},
     {"enable-input-view",
-     IDS_FLAGS_ENABLE_INPUT_VIEW_NAME,
-     IDS_FLAGS_ENABLE_INPUT_VIEW_DESCRIPTION,
+     IDS_FLAGS_INPUT_VIEW_NAME,
+     IDS_FLAGS_INPUT_VIEW_DESCRIPTION,
      kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView,
                                keyboard::switches::kDisableInputView)},
     {"disable-new-korean-ime",
-     IDS_FLAGS_DISABLE_NEW_KOREAN_IME_NAME,
-     IDS_FLAGS_DISABLE_NEW_KOREAN_IME_DESCRIPTION,
+     IDS_FLAGS_NEW_KOREAN_IME_NAME,
+     IDS_FLAGS_NEW_KOREAN_IME_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewKoreanIme)},
+     SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewKoreanIme)},
     {"enable-physical-keyboard-autocorrect",
-     IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME,
-     IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION,
+     IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME,
+     IDS_FLAGS_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION,
      kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(
          chromeos::switches::kEnablePhysicalKeyboardAutocorrect,
          chromeos::switches::kDisablePhysicalKeyboardAutocorrect)},
     {"disable-voice-input",
-     IDS_FLAGS_DISABLE_VOICE_INPUT_NAME,
-     IDS_FLAGS_DISABLE_VOICE_INPUT_DESCRIPTION,
+     IDS_FLAGS_VOICE_INPUT_NAME,
+     IDS_FLAGS_VOICE_INPUT_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(keyboard::switches::kDisableVoiceInput)},
+     SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableVoiceInput)},
     {"enable-experimental-input-view-features",
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME,
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION,
+     IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME,
+     IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(
          keyboard::switches::kEnableExperimentalInputViewFeatures)},
@@ -1238,13 +1243,13 @@
      SINGLE_VALUE_TYPE(ash::switches::kAshEnableFullscreenAppList)},
 #endif
     {"enable-simple-cache-backend",
-     IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_NAME,
-     IDS_FLAGS_ENABLE_SIMPLE_CACHE_BACKEND_DESCRIPTION,
+     IDS_FLAGS_SIMPLE_CACHE_BACKEND_NAME,
+     IDS_FLAGS_SIMPLE_CACHE_BACKEND_DESCRIPTION,
      kOsWin | kOsMac | kOsLinux | kOsCrOS,
      MULTI_VALUE_TYPE(kSimpleCacheBackendChoices)},
     {"enable-tcp-fast-open",
-     IDS_FLAGS_ENABLE_TCP_FAST_OPEN_NAME,
-     IDS_FLAGS_ENABLE_TCP_FAST_OPEN_DESCRIPTION,
+     IDS_FLAGS_TCP_FAST_OPEN_NAME,
+     IDS_FLAGS_TCP_FAST_OPEN_DESCRIPTION,
      kOsLinux | kOsCrOS | kOsAndroid,
      SINGLE_VALUE_TYPE(switches::kEnableTcpFastOpen)},
 #if defined(ENABLE_SERVICE_DISCOVERY)
@@ -1255,22 +1260,22 @@
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableDeviceDiscoveryNotifications,
                                switches::kDisableDeviceDiscoveryNotifications)},
     {"enable-print-preview-register-promos",
-     IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_NAME,
-     IDS_FLAGS_ENABLE_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION,
+     IDS_FLAGS_PRINT_PREVIEW_REGISTER_PROMOS_NAME,
+     IDS_FLAGS_PRINT_PREVIEW_REGISTER_PROMOS_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnablePrintPreviewRegisterPromos)},
 #endif  // ENABLE_SERVICE_DISCOVERY
 #if defined(ENABLE_PRINT_PREVIEW)
     {"enable-print-preview-simplify",
-     IDS_FLAGS_ENABLE_DISTILLER_IN_PRINT_PREVIEW_NAME,
-     IDS_FLAGS_ENABLE_DISTILLER_IN_PRINT_PREVIEW_DESCRIPTION,
+     IDS_FLAGS_DISTILLER_IN_PRINT_PREVIEW_NAME,
+     IDS_FLAGS_DISTILLER_IN_PRINT_PREVIEW_DESCRIPTION,
      kOsDesktop,
      FEATURE_VALUE_TYPE(PrintPreviewDistiller::kFeature)},
 #endif
 #if defined(OS_WIN)
     {"enable-cloud-print-xps",
-     IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_NAME,
-     IDS_FLAGS_ENABLE_CLOUD_PRINT_XPS_DESCRIPTION,
+     IDS_FLAGS_CLOUD_PRINT_XPS_NAME,
+     IDS_FLAGS_CLOUD_PRINT_XPS_DESCRIPTION,
      kOsWin,
      SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)},
 #endif
@@ -1288,38 +1293,39 @@
 #endif
 #if defined(TOOLKIT_VIEWS)
     {"disable-hide-inactive-stacked-tab-close-buttons",
-     IDS_FLAGS_DISABLE_HIDE_INACTIVE_STACKED_TAB_CLOSE_BUTTONS_NAME,
-     IDS_FLAGS_DISABLE_HIDE_INACTIVE_STACKED_TAB_CLOSE_BUTTONS_DESCRIPTION,
+     IDS_FLAGS_HIDE_INACTIVE_STACKED_TAB_CLOSE_BUTTONS_NAME,
+     IDS_FLAGS_HIDE_INACTIVE_STACKED_TAB_CLOSE_BUTTONS_DESCRIPTION,
      kOsCrOS | kOsWin | kOsLinux,
-     SINGLE_VALUE_TYPE(switches::kDisableHideInactiveStackedTabCloseButtons)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         switches::kDisableHideInactiveStackedTabCloseButtons)},
 #endif
 #if defined(ENABLE_SPELLCHECK)
     {"enable-spelling-feedback-field-trial",
-     IDS_FLAGS_ENABLE_SPELLING_FEEDBACK_FIELD_TRIAL_NAME,
-     IDS_FLAGS_ENABLE_SPELLING_FEEDBACK_FIELD_TRIAL_DESCRIPTION,
+     IDS_FLAGS_SPELLING_FEEDBACK_FIELD_TRIAL_NAME,
+     IDS_FLAGS_SPELLING_FEEDBACK_FIELD_TRIAL_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableSpellingFeedbackFieldTrial)},
 #endif
     {"enable-webgl-draft-extensions",
-     IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_NAME,
-     IDS_FLAGS_ENABLE_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION,
+     IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_NAME,
+     IDS_FLAGS_WEBGL_DRAFT_EXTENSIONS_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebGLDraftExtensions)},
     {"enable-new-profile-management",
-     IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME,
-     IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
+     IDS_FLAGS_NEW_PROFILE_MANAGEMENT_NAME,
+     IDS_FLAGS_NEW_PROFILE_MANAGEMENT_DESCRIPTION,
      kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableNewProfileManagement,
                                switches::kDisableNewProfileManagement)},
     {"enable-account-consistency",
-     IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME,
-     IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION,
+     IDS_FLAGS_ACCOUNT_CONSISTENCY_NAME,
+     IDS_FLAGS_ACCOUNT_CONSISTENCY_DESCRIPTION,
      kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAccountConsistency,
                                switches::kDisableAccountConsistency)},
     {"enable-iframe-based-signin",
-     IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_NAME,
-     IDS_FLAGS_ENABLE_IFRAME_BASED_SIGNIN_DESCRIPTION,
+     IDS_FLAGS_IFRAME_BASED_SIGNIN_NAME,
+     IDS_FLAGS_IFRAME_BASED_SIGNIN_DESCRIPTION,
      kOsMac | kOsWin | kOsLinux,
      SINGLE_VALUE_TYPE(switches::kEnableIframeBasedSignin)},
     {"enable-password-separated-signin-flow",
@@ -1329,8 +1335,8 @@
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePasswordSeparatedSigninFlow,
                                switches::kDisablePasswordSeparatedSigninFlow)},
     {"enable-google-profile-info",
-     IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_NAME,
-     IDS_FLAGS_ENABLE_GOOGLE_PROFILE_INFO_DESCRIPTION,
+     IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME,
+     IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION,
      kOsMac | kOsWin | kOsLinux,
      SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)},
 #if defined(ENABLE_APP_LIST)
@@ -1342,8 +1348,8 @@
 #endif
 #if defined(OS_ANDROID)
     {"enable-accessibility-tab-switcher",
-     IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_NAME,
-     IDS_FLAGS_ENABLE_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
+     IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_NAME,
+     IDS_FLAGS_ACCESSIBILITY_TAB_SWITCHER_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE(switches::kEnableAccessibilityTabSwitcher)},
     {"enable-physical-web",
@@ -1353,15 +1359,15 @@
      SINGLE_VALUE_TYPE(switches::kEnablePhysicalWeb)},
 #endif
     {"enable-zero-copy",
-     IDS_FLAGS_ENABLE_ZERO_COPY_NAME,
-     IDS_FLAGS_ENABLE_ZERO_COPY_DESCRIPTION,
+     IDS_FLAGS_ZERO_COPY_NAME,
+     IDS_FLAGS_ZERO_COPY_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableZeroCopy,
                                switches::kDisableZeroCopy)},
 #if defined(OS_CHROMEOS)
     {"enable-first-run-ui-transitions",
-     IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_NAME,
-     IDS_FLAGS_ENABLE_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION,
+     IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_NAME,
+     IDS_FLAGS_FIRST_RUN_UI_TRANSITIONS_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kEnableFirstRunUITransitions)},
 #endif
@@ -1379,53 +1385,54 @@
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableHostedAppsInWindows,
                                switches::kDisableHostedAppsInWindows)},
     {"disable-hosted-app-shim-creation",
-     IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_NAME,
-     IDS_FLAGS_DISABLE_HOSTED_APP_SHIM_CREATION_DESCRIPTION,
+     IDS_FLAGS_HOSTED_APP_SHIM_CREATION_NAME,
+     IDS_FLAGS_HOSTED_APP_SHIM_CREATION_DESCRIPTION,
      kOsMac,
-     SINGLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableHostedAppShimCreation)},
     {"enable-hosted-app-quit-notification",
-     IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_NAME,
-     IDS_FLAGS_ENABLE_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION,
+     IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_NAME,
+     IDS_FLAGS_HOSTED_APP_QUIT_NOTIFICATION_DESCRIPTION,
      kOsMac,
      SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)},
 #endif
 #if defined(OS_ANDROID)
     {"disable-pull-to-refresh-effect",
-     IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_NAME,
-     IDS_FLAGS_DISABLE_PULL_TO_REFRESH_EFFECT_DESCRIPTION,
+     IDS_FLAGS_PULL_TO_REFRESH_EFFECT_NAME,
+     IDS_FLAGS_PULL_TO_REFRESH_EFFECT_DESCRIPTION,
      kOsAndroid,
-     SINGLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisablePullToRefreshEffect)},
 #endif
 #if defined(OS_MACOSX)
     {"enable-translate-new-ux",
-     IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_NAME,
-     IDS_FLAGS_ENABLE_TRANSLATE_NEW_UX_DESCRIPTION,
+     IDS_FLAGS_TRANSLATE_NEW_UX_NAME,
+     IDS_FLAGS_TRANSLATE_NEW_UX_DESCRIPTION,
      kOsMac,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
                                switches::kDisableTranslateNewUX)},
 #endif
 #if defined(TOOLKIT_VIEWS)
     {"disable-views-rect-based-targeting",  // FLAGS:RECORD_UMA
-     IDS_FLAGS_DISABLE_VIEWS_RECT_BASED_TARGETING_NAME,
-     IDS_FLAGS_DISABLE_VIEWS_RECT_BASED_TARGETING_DESCRIPTION,
+     IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_NAME,
+     IDS_FLAGS_VIEWS_RECT_BASED_TARGETING_DESCRIPTION,
      kOsCrOS | kOsWin | kOsLinux,
-     SINGLE_VALUE_TYPE(views::switches::kDisableViewsRectBasedTargeting)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         views::switches::kDisableViewsRectBasedTargeting)},
     {"enable-link-disambiguation-popup",
-     IDS_FLAGS_ENABLE_LINK_DISAMBIGUATION_POPUP_NAME,
-     IDS_FLAGS_ENABLE_LINK_DISAMBIGUATION_POPUP_DESCRIPTION,
+     IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_NAME,
+     IDS_FLAGS_LINK_DISAMBIGUATION_POPUP_DESCRIPTION,
      kOsCrOS | kOsWin,
      SINGLE_VALUE_TYPE(switches::kEnableLinkDisambiguationPopup)},
 #endif
 #if defined(ENABLE_EXTENSIONS)
     {"enable-apps-show-on-first-paint",
-     IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_NAME,
-     IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION,
+     IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_NAME,
+     IDS_FLAGS_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)},
 #endif
     {"enhanced-bookmarks-experiment",
-     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
-     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
+     IDS_FLAGS_ENHANCED_BOOKMARKS_NAME,
+     IDS_FLAGS_ENHANCED_BOOKMARKS_DESCRIPTION,
      kOsDesktop | kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(switches::kEnhancedBookmarksExperiment,
                                          "1",
@@ -1449,21 +1456,21 @@
      kOsAll,
      MULTI_VALUE_TYPE(kNumRasterThreadsChoices)},
     {"enable-single-click-autofill",
-     IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_NAME,
-     IDS_FLAGS_ENABLE_SINGLE_CLICK_AUTOFILL_DESCRIPTION,
+     IDS_FLAGS_SINGLE_CLICK_AUTOFILL_NAME,
+     IDS_FLAGS_SINGLE_CLICK_AUTOFILL_DESCRIPTION,
      kOsCrOS | kOsMac | kOsWin | kOsLinux | kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(
          autofill::switches::kEnableSingleClickAutofill,
          autofill::switches::kDisableSingleClickAutofill)},
     {"enable-site-engagement-service",
-     IDS_FLAGS_ENABLE_SITE_ENGAGEMENT_SERVICE_NAME,
-     IDS_FLAGS_ENABLE_SITE_ENGAGEMENT_SERVICE_DESCRIPTION,
+     IDS_FLAGS_SITE_ENGAGEMENT_SERVICE_NAME,
+     IDS_FLAGS_SITE_ENGAGEMENT_SERVICE_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSiteEngagementService,
                                switches::kDisableSiteEngagementService)},
     {"enable-session-crashed-bubble",
-     IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_NAME,
-     IDS_FLAGS_ENABLE_SESSION_CRASHED_BUBBLE_DESCRIPTION,
+     IDS_FLAGS_SESSION_CRASHED_BUBBLE_NAME,
+     IDS_FLAGS_SESSION_CRASHED_BUBBLE_DESCRIPTION,
      kOsWin | kOsLinux,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSessionCrashedBubble,
                                switches::kDisableSessionCrashedBubble)},
@@ -1474,10 +1481,10 @@
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePdfMaterialUI,
                                switches::kDisablePdfMaterialUI)},
     {"disable-cast-streaming-hw-encoding",
-     IDS_FLAGS_DISABLE_CAST_STREAMING_HW_ENCODING_NAME,
-     IDS_FLAGS_DISABLE_CAST_STREAMING_HW_ENCODING_DESCRIPTION,
+     IDS_FLAGS_CAST_STREAMING_HW_ENCODING_NAME,
+     IDS_FLAGS_CAST_STREAMING_HW_ENCODING_DESCRIPTION,
      kOsAll,
-     SINGLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableCastStreamingHWEncoding)},
 #if defined(OS_ANDROID)
     {"prefetch-search-results",
      IDS_FLAGS_PREFETCH_SEARCH_RESULTS_NAME,
@@ -1487,52 +1494,52 @@
 #endif
 #if defined(ENABLE_APP_LIST)
     {"enable-experimental-app-list",
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_NAME,
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_APP_LIST_DESCRIPTION,
+     IDS_FLAGS_EXPERIMENTAL_APP_LIST_NAME,
+     IDS_FLAGS_EXPERIMENTAL_APP_LIST_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(
          app_list::switches::kEnableExperimentalAppList,
          app_list::switches::kDisableExperimentalAppList)},
     {"enable-centered-app-list",
-     IDS_FLAGS_ENABLE_CENTERED_APP_LIST_NAME,
-     IDS_FLAGS_ENABLE_CENTERED_APP_LIST_DESCRIPTION,
+     IDS_FLAGS_CENTERED_APP_LIST_NAME,
+     IDS_FLAGS_CENTERED_APP_LIST_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS,
      SINGLE_VALUE_TYPE(app_list::switches::kEnableCenteredAppList)},
     {"enable-new-app-list-mixer",
-     IDS_FLAGS_ENABLE_NEW_APP_LIST_MIXER_NAME,
-     IDS_FLAGS_ENABLE_NEW_APP_LIST_MIXER_DESCRIPTION,
+     IDS_FLAGS_NEW_APP_LIST_MIXER_NAME,
+     IDS_FLAGS_NEW_APP_LIST_MIXER_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsMac,
      ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableNewAppListMixer,
                                app_list::switches::kDisableNewAppListMixer)},
 #endif
     {"disable-threaded-scrolling",
-     IDS_FLAGS_DISABLE_THREADED_SCROLLING_NAME,
-     IDS_FLAGS_DISABLE_THREADED_SCROLLING_DESCRIPTION,
+     IDS_FLAGS_THREADED_SCROLLING_NAME,
+     IDS_FLAGS_THREADED_SCROLLING_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsAndroid | kOsMac,
-     SINGLE_VALUE_TYPE(switches::kDisableThreadedScrolling)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableThreadedScrolling)},
     {"enable-settings-window",
-     IDS_FLAGS_ENABLE_SETTINGS_WINDOW_NAME,
-     IDS_FLAGS_ENABLE_SETTINGS_WINDOW_DESCRIPTION,
+     IDS_FLAGS_SETTINGS_WINDOW_NAME,
+     IDS_FLAGS_SETTINGS_WINDOW_DESCRIPTION,
      kOsDesktop,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSettingsWindow,
                                switches::kDisableSettingsWindow)},
 #if defined(OS_MACOSX)
     {"enable-save-password-bubble",
-     IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_NAME,
-     IDS_FLAGS_ENABLE_SAVE_PASSWORD_BUBBLE_DESCRIPTION,
+     IDS_FLAGS_SAVE_PASSWORD_BUBBLE_NAME,
+     IDS_FLAGS_SAVE_PASSWORD_BUBBLE_DESCRIPTION,
      kOsMac,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSavePasswordBubble,
                                switches::kDisableSavePasswordBubble)},
 #endif
     {"enable-apps-file-associations",
-     IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME,
-     IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION,
+     IDS_FLAGS_APPS_FILE_ASSOCIATIONS_NAME,
+     IDS_FLAGS_APPS_FILE_ASSOCIATIONS_DESCRIPTION,
      kOsMac,
      SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)},
 #if defined(OS_ANDROID)
     {"enable-embeddedsearch-api",
-     IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME,
-     IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION,
+     IDS_FLAGS_EMBEDDEDSEARCH_API_NAME,
+     IDS_FLAGS_EMBEDDEDSEARCH_API_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI)},
 #endif
@@ -1556,49 +1563,49 @@
 #endif
 #if defined(OS_ANDROID)
     {"enable-data-reduction-proxy-dev",
-     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_NAME,
-     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_DEV_DESCRIPTION,
+     IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_NAME,
+     IDS_FLAGS_DATA_REDUCTION_PROXY_DEV_DESCRIPTION,
      kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(
          data_reduction_proxy::switches::kEnableDataReductionProxyDev,
          data_reduction_proxy::switches::kDisableDataReductionProxyDev)},
     {"enable-data-reduction-proxy-carrier-test",
-     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME,
-     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION,
+     IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_NAME,
+     IDS_FLAGS_DATA_REDUCTION_PROXY_CARRIER_TEST_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE(
          data_reduction_proxy::switches::kEnableDataReductionProxyCarrierTest)},
 #endif
     {"enable-hotword-hardware",
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
-     IDS_FLAGS_ENABLE_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION,
+     IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_NAME,
+     IDS_FLAGS_EXPERIMENTAL_HOTWORD_HARDWARE_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableExperimentalHotwordHardware)},
 #if defined(ENABLE_EXTENSIONS)
     {"enable-embedded-extension-options",
-     IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_NAME,
-     IDS_FLAGS_ENABLE_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION,
+     IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_NAME,
+     IDS_FLAGS_EMBEDDED_EXTENSION_OPTIONS_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(extensions::switches::kEnableEmbeddedExtensionOptions)},
 #endif
 #if defined(USE_ASH)
     {"enable-web-app-frame",
-     IDS_FLAGS_ENABLE_WEB_APP_FRAME_NAME,
-     IDS_FLAGS_ENABLE_WEB_APP_FRAME_DESCRIPTION,
+     IDS_FLAGS_WEB_APP_FRAME_NAME,
+     IDS_FLAGS_WEB_APP_FRAME_DESCRIPTION,
      kOsWin | kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableWebAppFrame)},
 #endif
     {"enable-drop-sync-credential",
-     IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_NAME,
-     IDS_FLAGS_ENABLE_DROP_SYNC_CREDENTIAL_DESCRIPTION,
+     IDS_FLAGS_DROP_SYNC_CREDENTIAL_NAME,
+     IDS_FLAGS_DROP_SYNC_CREDENTIAL_DESCRIPTION,
      kOsAll,
      ENABLE_DISABLE_VALUE_TYPE(
          password_manager::switches::kEnableDropSyncCredential,
          password_manager::switches::kDisableDropSyncCredential)},
 #if defined(ENABLE_EXTENSIONS)
     {"enable-extension-action-redesign",
-     IDS_FLAGS_ENABLE_EXTENSION_ACTION_REDESIGN_NAME,
-     IDS_FLAGS_ENABLE_EXTENSION_ACTION_REDESIGN_DESCRIPTION,
+     IDS_FLAGS_EXTENSION_ACTION_REDESIGN_NAME,
+     IDS_FLAGS_EXTENSION_ACTION_REDESIGN_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(extensions::switches::kEnableExtensionActionRedesign)},
 #endif
@@ -1609,8 +1616,8 @@
      MULTI_VALUE_TYPE(kAutofillSyncCredentialChoices)},
 #if !defined(OS_ANDROID)
     {"enable-message-center-always-scroll-up-upon-notification-removal",
-     IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME,
-     IDS_FLAGS_ENABLE_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION,
+     IDS_FLAGS_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_NAME,
+     IDS_FLAGS_MESSAGE_CENTER_ALWAYS_SCROLL_UP_UPON_REMOVAL_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(
          switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)},
@@ -1633,8 +1640,8 @@
      SINGLE_VALUE_TYPE(chromeos::switches::kWakeOnWifiPacket)},
 #endif  // OS_CHROMEOS
     {"enable-tab-audio-muting",
-     IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_NAME,
-     IDS_FLAGS_ENABLE_TAB_AUDIO_MUTING_DESCRIPTION,
+     IDS_FLAGS_TAB_AUDIO_MUTING_NAME,
+     IDS_FLAGS_TAB_AUDIO_MUTING_DESCRIPTION,
      kOsDesktop,
      SINGLE_VALUE_TYPE(switches::kEnableTabAudioMuting)},
     {"enable-credential-manager-api",
@@ -1649,34 +1656,35 @@
      SINGLE_VALUE_TYPE(switches::kReducedReferrerGranularity)},
 #if defined(OS_CHROMEOS)
     {"disable-new-zip-unpacker",
-     IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_NAME,
-     IDS_FLAGS_DISABLE_NEW_ZIP_UNPACKER_DESCRIPTION,
+     IDS_FLAGS_NEW_ZIP_UNPACKER_NAME,
+     IDS_FLAGS_NEW_ZIP_UNPACKER_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)},
+     SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableNewZIPUnpacker)},
 #endif  // defined(OS_CHROMEOS)
     {"enable-credit-card-scan",
-     IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_NAME,
-     IDS_FLAGS_ENABLE_CREDIT_CARD_SCAN_DESCRIPTION,
+     IDS_FLAGS_CREDIT_CARD_SCAN_NAME,
+     IDS_FLAGS_CREDIT_CARD_SCAN_DESCRIPTION,
      kOsAndroid,
      ENABLE_DISABLE_VALUE_TYPE(autofill::switches::kEnableCreditCardScan,
                                autofill::switches::kDisableCreditCardScan)},
 #if defined(OS_CHROMEOS)
     {"disable-captive-portal-bypass-proxy",
-     IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
-     IDS_FLAGS_DISABLE_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
+     IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_NAME,
+     IDS_FLAGS_CAPTIVE_PORTAL_BYPASS_PROXY_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableCaptivePortalBypassProxy)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         chromeos::switches::kDisableCaptivePortalBypassProxy)},
 #endif  // defined(OS_CHROMEOS)
 #if defined(OS_ANDROID)
     {"enable-seccomp-sandbox-android",
-     IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
-     IDS_FLAGS_ENABLE_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
+     IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_NAME,
+     IDS_FLAGS_SECCOMP_FILTER_SANDBOX_ANDROID_DESCRIPTION,
      kOsAndroid,
      FEATURE_VALUE_TYPE(content::kSeccompSandboxAndroidFeature)},
 #endif
     {"enable-touch-hover",
-     IDS_FLAGS_ENABLE_TOUCH_HOVER_NAME,
-     IDS_FLAGS_ENABLE_TOUCH_HOVER_DESCRIPTION,
+     IDS_FLAGS_TOUCH_HOVER_NAME,
+     IDS_FLAGS_TOUCH_HOVER_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE("enable-touch-hover")},
     {"enable-fill-on-account-select",
@@ -1686,8 +1694,8 @@
      MULTI_VALUE_TYPE(kFillOnAccountSelectChoices)},
 #if defined(OS_CHROMEOS)
     {"enable-wifi-credential-sync",  // FLAGS:RECORD_UMA
-     IDS_FLAGS_ENABLE_WIFI_CREDENTIAL_SYNC_NAME,
-     IDS_FLAGS_ENABLE_WIFI_CREDENTIAL_SYNC_DESCRIPTION,
+     IDS_FLAGS_WIFI_CREDENTIAL_SYNC_NAME,
+     IDS_FLAGS_WIFI_CREDENTIAL_SYNC_DESCRIPTION,
      kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableWifiCredentialSync)},
     {"enable-potentially-annoying-security-features",
@@ -1700,30 +1708,31 @@
      IDS_FLAGS_DISABLE_DELAY_AGNOSTIC_AEC_NAME,
      IDS_FLAGS_DISABLE_DELAY_AGNOSTIC_AEC_DESCRIPTION,
      kOsWin | kOsLinux | kOsCrOS | kOsMac,
-     SINGLE_VALUE_TYPE(switches::kDisableDelayAgnosticAec)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableDelayAgnosticAec)},
     {"mark-non-secure-as",  // FLAGS:RECORD_UMA
      IDS_MARK_NON_SECURE_AS_NAME,
      IDS_MARK_NON_SECURE_AS_DESCRIPTION,
      kOsAll,
      MULTI_VALUE_TYPE(kMarkNonSecureAsChoices)},
     {"enable-site-per-process",
-     IDS_FLAGS_ENABLE_SITE_PER_PROCESS_NAME,
-     IDS_FLAGS_ENABLE_SITE_PER_PROCESS_DESCRIPTION,
+     IDS_FLAGS_SITE_PER_PROCESS_NAME,
+     IDS_FLAGS_SITE_PER_PROCESS_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kSitePerProcess)},
 #if defined(OS_MACOSX)
     {"enable-harfbuzz-rendertext",
-     IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME,
-     IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION,
+     IDS_FLAGS_HARFBUZZ_RENDERTEXT_NAME,
+     IDS_FLAGS_HARFBUZZ_RENDERTEXT_DESCRIPTION,
      kOsMac,
      SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)},
 #endif  // defined(OS_MACOSX)
 #if defined(OS_CHROMEOS)
     {"disable-timezone-tracking",
-     IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME,
-     IDS_FLAGS_DISABLE_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION,
+     IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_NAME,
+     IDS_FLAGS_RESOLVE_TIMEZONE_BY_GEOLOCATION_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableTimeZoneTrackingOption)},
+     SINGLE_DISABLE_VALUE_TYPE(
+         chromeos::switches::kDisableTimeZoneTrackingOption)},
 #endif  // defined(OS_CHROMEOS)
     {"data-reduction-proxy-lo-fi",
      IDS_FLAGS_DATA_REDUCTION_PROXY_LO_FI_NAME,
@@ -1750,8 +1759,8 @@
                            kEnableDataReductionProxyConfigClient)},
 #if defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
     {"enable-data-reduction-proxy-bypass-warnings",
-     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME,
-     IDS_FLAGS_ENABLE_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION,
+     IDS_FLAGS_DATA_REDUCTION_PROXY_BYPASS_WARNING_NAME,
+     IDS_FLAGS_DATA_REDUCTION_PROXY_BYPASS_WARNING_DESCRIPTION,
      kOsAndroid,
      SINGLE_VALUE_TYPE(data_reduction_proxy::switches::
                            kEnableDataReductionProxyBypassWarning)},
@@ -1762,8 +1771,8 @@
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kAllowInsecureLocalhost)},
     {"enable-add-to-shelf",
-     IDS_FLAGS_ENABLE_ADD_TO_SHELF_NAME,
-     IDS_FLAGS_ENABLE_ADD_TO_SHELF_DESCRIPTION,
+     IDS_FLAGS_ADD_TO_SHELF_NAME,
+     IDS_FLAGS_ADD_TO_SHELF_DESCRIPTION,
      kOsDesktop,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAddToShelf,
                                switches::kDisableAddToShelf)},
@@ -1800,8 +1809,8 @@
                                switches::kDisableOutOfProcessPac)},
 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
     {"media-router",
-     IDS_FLAGS_ENABLE_MEDIA_ROUTER_NAME,
-     IDS_FLAGS_ENABLE_MEDIA_ROUTER_DESCRIPTION,
+     IDS_FLAGS_MEDIA_ROUTER_NAME,
+     IDS_FLAGS_MEDIA_ROUTER_DESCRIPTION,
      kOsDesktop,
      ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
          switches::kMediaRouter, "1", switches::kMediaRouter, "0")},
@@ -1810,8 +1819,8 @@
 // enable-drive-search-in-chrome-launcher flag.
 #if defined(ENABLE_APP_LIST)
     {"enable-drive-search-in-app-launcher",
-     IDS_FLAGS_ENABLE_DRIVE_SEARCH_IN_CHROME_LAUNCHER,
-     IDS_FLAGS_ENABLE_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION,
+     IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER,
+     IDS_FLAGS_DRIVE_SEARCH_IN_CHROME_LAUNCHER_DESCRIPTION,
      kOsCrOS,
      ENABLE_DISABLE_VALUE_TYPE(
          app_list::switches::kEnableDriveSearchInChromeLauncher,
@@ -1819,10 +1828,10 @@
 #endif  // defined(ENABLE_APP_LIST)
 #if defined(OS_CHROMEOS)
     {"disable-mtp-write-support",
-     IDS_FLAG_DISABLE_MTP_WRITE_SUPPORT_NAME,
-     IDS_FLAG_DISABLE_MTP_WRITE_SUPPORT_DESCRIPTION,
+     IDS_FLAGS_MTP_WRITE_SUPPORT_NAME,
+     IDS_FLAGS_MTP_WRITE_SUPPORT_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(chromeos::switches::kDisableMtpWriteSupport)},
+     SINGLE_DISABLE_VALUE_TYPE(chromeos::switches::kDisableMtpWriteSupport)},
 #endif  // defined(OS_CHROMEOS)
 #if defined(OS_CHROMEOS)
     {"enable-datasaver-prompt",
@@ -1869,8 +1878,8 @@
      SINGLE_VALUE_TYPE(switches::kEmphasizeTitlesInOmniboxDropdown)},
 #if defined(ENABLE_WEBRTC)
     {"enable-webrtc-dtls12",
-     IDS_FLAGS_ENABLE_WEBRTC_DTLS12_NAME,
-     IDS_FLAGS_ENABLE_WEBRTC_DTLS12_DESCRIPTION,
+     IDS_FLAGS_WEBRTC_DTLS12_NAME,
+     IDS_FLAGS_WEBRTC_DTLS12_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebRtcDtls12)},
 #endif
@@ -1901,17 +1910,17 @@
 #endif
 #if defined(ENABLE_WEBVR)
     {"enable-webvr",
-     IDS_FLAGS_ENABLE_WEBVR_NAME,
-     IDS_FLAGS_ENABLE_WEBVR_DESCRIPTION,
+     IDS_FLAGS_WEBVR_NAME,
+     IDS_FLAGS_WEBVR_DESCRIPTION,
      kOsAll,
      SINGLE_VALUE_TYPE(switches::kEnableWebVR)},
 #endif
 #if defined(OS_CHROMEOS)
     {"disable-accelerated-mjpeg-decode",
-     IDS_FLAGS_DISABLE_ACCELERATED_MJPEG_DECODE_NAME,
-     IDS_FLAGS_DISABLE_ACCELERATED_MJPEG_DECODE_DESCRIPTION,
+     IDS_FLAGS_ACCELERATED_MJPEG_DECODE_NAME,
+     IDS_FLAGS_ACCELERATED_MJPEG_DECODE_DESCRIPTION,
      kOsCrOS,
-     SINGLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
 #endif  // OS_CHROMEOS
     {"v8-cache-options",
      IDS_FLAGS_V8_CACHE_OPTIONS_NAME,
@@ -1935,10 +1944,10 @@
     },
 #if defined(ENABLE_TASK_MANAGER)
     {"disable-new-task-manager",
-     IDS_FLAGS_DISABLE_NEW_TASK_MANAGER_NAME,
-     IDS_FLAGS_DISABLE_NEW_TASK_MANAGER_DESCRIPTION,
+     IDS_FLAGS_NEW_TASK_MANAGER_NAME,
+     IDS_FLAGS_NEW_TASK_MANAGER_DESCRIPTION,
      kOsDesktop,
-     SINGLE_VALUE_TYPE(switches::kDisableNewTaskManager)
+     SINGLE_DISABLE_VALUE_TYPE(switches::kDisableNewTaskManager)
     },
 #endif  // defined(ENABLE_TASK_MANAGER)
     {"simplified-fullscreen-ui",
@@ -2000,8 +2009,8 @@
 #endif  // defined(OS_WIN)
 #if defined(ENABLE_BACKGROUND)
     {"enable-push-api-background-mode",
-     IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_NAME,
-     IDS_FLAGS_ENABLE_PUSH_API_BACKGROUND_MODE_DESCRIPTION,
+     IDS_FLAGS_PUSH_API_BACKGROUND_MODE_NAME,
+     IDS_FLAGS_PUSH_API_BACKGROUND_MODE_DESCRIPTION,
      kOsMac | kOsWin | kOsLinux,
      ENABLE_DISABLE_VALUE_TYPE(switches::kEnablePushApiBackgroundMode,
                                switches::kDisablePushApiBackgroundMode)},