[flash] Update Content Settings Page to Recommend BLOCK

BLOCK is now the default setting for Flash.

Update the strings in Content Settings Page to make BLOCK
"(recommended)" instead of ASK.

Bug: 967046
Change-Id: I515e70e2ba2bbd9a716b46af1567522ebab3a2b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1628422Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663777}

chrome/app/settings_strings.grdp

@@ -3147,6 +3147,9 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK" desc="The 'block' label for Flash in site settings.">
     Block sites from running Flash
   </message>
+  <message name="IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK_RECOMMENDED" desc="The 'block' label for Flash in site settings -- the recommended setting due to impending deprecation.">
+    Block sites from running Flash (recommended)
+  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_FLASH_PERMISSIONS_ARE_EPHEMERAL" desc="The notice that Flash permissions are ephemeral, at the top of the Flash settings page.">
     Your Flash settings will be kept until you quit Chrome.
   </message>

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -439,8 +439,8 @@
             $i18n{siteSettingsFlashPermissionsEphemeral}
           </a>
           <category-default-setting category="{{ContentSettingsTypes.PLUGINS}}"
-              toggle-off-label="$i18n{siteSettingsFlashBlock}"
-              toggle-on-label="$i18n{siteSettingsFlashAskFirstRecommended}">
+              toggle-off-label="$i18n{siteSettingsFlashBlockRecommended}"
+              toggle-on-label="$i18n{siteSettingsFlashAskFirst}">
           </category-default-setting>
 <if expr="chromeos">
           <a class="settings-box inherit-color no-outline" tabindex="-1"

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -2476,8 +2476,9 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
     {"siteSettingsSoundBlock", IDS_SETTINGS_SITE_SETTINGS_SOUND_BLOCK},
     {"siteSettingsFlash", IDS_SETTINGS_SITE_SETTINGS_FLASH},
     {"siteSettingsFlashAskFirst", IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST},
-    {"siteSettingsFlashAskFirstRecommended",
-     IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST_RECOMMENDED},
+    {"siteSettingsFlashBlock", IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK},
+    {"siteSettingsFlashBlockRecommended",
+     IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK_RECOMMENDED},
     {"siteSettingsFlashPermissionsEphemeral",
      IDS_SETTINGS_SITE_SETTINGS_FLASH_PERMISSIONS_ARE_EPHEMERAL},
     {"siteSettingsPdfDocuments", IDS_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS},
@@ -2532,7 +2533,6 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING},
     {"siteSettingsAskBeforeSendingRecommended",
      IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING_RECOMMENDED},
-    {"siteSettingsFlashBlock", IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK},
     {"siteSettingsAllowRecentlyClosedSites",
      IDS_SETTINGS_SITE_SETTINGS_ALLOW_RECENTLY_CLOSED_SITES},
     {"siteSettingsAllowRecentlyClosedSitesRecommended",