Autoplay: change feature flags associated with string changes.

Bug: 905128
Change-Id: I590981ee93a645cef51586c880b5225ab03f2c29
Reviewed-on: https://chromium-review.googlesource.com/c/1335028Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608573}

chrome/browser/resources/settings/site_settings/site_details_permission.js

@@ -117,7 +117,7 @@ Polymer({
    */
   useCustomSoundLabels_: function(category) {
     return category == settings.ContentSettingsTypes.SOUND &&
-        loadTimeData.getBoolean('enableBlockAutoplayContentSetting');
+        loadTimeData.getBoolean('enableAutoplayWhitelistContentSetting');
   },
 
   /**

chrome/browser/ui/page_info/page_info_ui.cc

@@ -335,7 +335,7 @@ base::string16 PageInfoUI::PermissionActionToUIString(
       if (setting == CONTENT_SETTING_DEFAULT) {
 #if !defined(OS_ANDROID)
         if (type == CONTENT_SETTINGS_TYPE_SOUND &&
-            base::FeatureList::IsEnabled(media::kAutoplayDisableSettings)) {
+            base::FeatureList::IsEnabled(media::kAutoplayWhitelistSettings)) {
           // If the block autoplay enabled preference is enabled and the
           // sound default setting is ALLOW, we will return a custom string
           // indicating that Chrome is controlling autoplay and sound
@@ -359,7 +359,7 @@ base::string16 PageInfoUI::PermissionActionToUIString(
     case content_settings::SETTING_SOURCE_EXTENSION:
 #if !defined(OS_ANDROID)
       if (type == CONTENT_SETTINGS_TYPE_SOUND &&
-          base::FeatureList::IsEnabled(media::kAutoplayDisableSettings)) {
+          base::FeatureList::IsEnabled(media::kAutoplayWhitelistSettings)) {
         button_text_ids = kSoundPermissionButtonTextIDUserManaged;
         break;
       }

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

@@ -2555,6 +2555,10 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
       "enableBlockAutoplayContentSetting",
       base::FeatureList::IsEnabled(media::kAutoplayDisableSettings));
 
+  html_source->AddBoolean(
+      "enableAutoplayWhitelistContentSetting",
+      base::FeatureList::IsEnabled(media::kAutoplayWhitelistSettings));
+
   html_source->AddBoolean(
       "enableClipboardContentSetting",
       base::FeatureList::IsEnabled(features::kClipboardContentSetting));

chrome/test/data/webui/settings/site_details_permission_tests.js

@@ -28,7 +28,7 @@ suite('SiteDetailsPermission', function() {
             settings.ContentSettingsTypes.CAMERA,
             [test_util.createRawSiteException('https://www.example.com')])]);
 
-    loadTimeData.overrideValues({enableBlockAutoplayContentSetting: true});
+    loadTimeData.overrideValues({enableAutoplayWhitelistContentSetting: true});
 
     browserProxy = new TestSiteSettingsPrefsBrowserProxy();
     settings.SiteSettingsPrefsBrowserProxyImpl.instance_ = browserProxy;