Autoplay: remove muted autoplay settings UI.

A follow-up will remove the associated backend code.

Bug: 1028264
Change-Id: I503e8a1b11b86168c074c89fa8160f09f0ebecc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934728Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719354}

chrome/android/java/res/xml/single_website_preferences.xml

@@ -64,8 +64,6 @@
         android:key="automatic_downloads_permission_list" />
     <ListPreference
         android:key="protected_media_identifier_permission_list" />
-    <ListPreference
-        android:key="autoplay_permission_list" />
     <ListPreference
         android:key="sound_permission_list" />
     <ListPreference

chrome/android/java/res/xml/site_settings_preferences.xml

@@ -61,17 +61,6 @@
     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
         android:key="protected_content" />
-    <!-- Autoplay -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"
-        android:key="autoplay" />
-    <!-- Media -->
-    <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
-        android:fragment="org.chromium.chrome.browser.preferences.website.SiteSettingsPreferences"
-        android:key="media"
-        android:title="@string/media_permission_title"
-        android:icon="@drawable/settings_media"
-        app:iconTint="@color/default_icon_color" />
     <!-- Sound -->
     <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
         android:fragment="org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences"

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingException.java

@@ -17,26 +17,25 @@ import java.lang.annotation.RetentionPolicy;
  * Exception information for a given origin.
  */
 public class ContentSettingException implements Serializable {
-    @IntDef({Type.ADS, Type.AUTOMATIC_DOWNLOADS, Type.AUTOPLAY, Type.BACKGROUND_SYNC, Type.COOKIE,
-            Type.JAVASCRIPT, Type.POPUP, Type.SOUND, Type.BLUETOOTH_SCANNING})
+    @IntDef({Type.ADS, Type.AUTOMATIC_DOWNLOADS, Type.BACKGROUND_SYNC, Type.COOKIE, Type.JAVASCRIPT,
+            Type.POPUP, Type.SOUND, Type.BLUETOOTH_SCANNING})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Type {
         // Values used to address array index - should be enumerated from 0 and can't have gaps.
         // All updates here must also be reflected in {@link #getContentSettingsType(int)
         // getContentSettingsType} and {@link SingleWebsitePreferences.PERMISSION_PREFERENCE_KEYS}.
         int ADS = 0;
-        int AUTOPLAY = 1;
-        int BACKGROUND_SYNC = 2;
-        int COOKIE = 3;
-        int JAVASCRIPT = 4;
-        int POPUP = 5;
-        int SOUND = 6;
-        int AUTOMATIC_DOWNLOADS = 7;
-        int BLUETOOTH_SCANNING = 8;
+        int BACKGROUND_SYNC = 1;
+        int COOKIE = 2;
+        int JAVASCRIPT = 3;
+        int POPUP = 4;
+        int SOUND = 5;
+        int AUTOMATIC_DOWNLOADS = 6;
+        int BLUETOOTH_SCANNING = 7;
         /**
          * Number of handled exceptions used for calculating array sizes.
          */
-        int NUM_ENTRIES = 9;
+        int NUM_ENTRIES = 8;
     }
 
     private final int mContentSettingType;
@@ -88,8 +87,6 @@ public class ContentSettingException implements Serializable {
                 return ContentSettingsType.ADS;
             case Type.AUTOMATIC_DOWNLOADS:
                 return ContentSettingsType.AUTOMATIC_DOWNLOADS;
-            case Type.AUTOPLAY:
-                return ContentSettingsType.AUTOPLAY;
             case Type.BACKGROUND_SYNC:
                 return ContentSettingsType.BACKGROUND_SYNC;
             case Type.BLUETOOTH_SCANNING:

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java

@@ -107,11 +107,6 @@ public class ContentSettingsResources {
                             R.string.automatic_downloads_permission_title,
                             R.string.automatic_downloads_permission_title, ContentSettingValues.ASK,
                             ContentSettingValues.BLOCK, R.string.website_settings_category_ask, 0));
-            localMap.put(ContentSettingsType.AUTOPLAY,
-                    new ResourceItem(R.drawable.settings_autoplay, R.string.autoplay_title,
-                            R.string.autoplay_title, ContentSettingValues.ALLOW,
-                            ContentSettingValues.BLOCK,
-                            R.string.website_settings_category_autoplay_allowed, 0));
             localMap.put(ContentSettingsType.BACKGROUND_SYNC,
                     new ResourceItem(R.drawable.permission_background_sync,
                             R.string.background_sync_permission_title,

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

@@ -483,8 +483,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
 
             // Categories that support adding exceptions also manage the 'Add site' preference.
             // This should only be used for settings that have host-pattern based exceptions.
-            if (mCategory.showSites(SiteSettingsCategory.Type.AUTOPLAY)
-                    || mCategory.showSites(SiteSettingsCategory.Type.BACKGROUND_SYNC)
+            if (mCategory.showSites(SiteSettingsCategory.Type.BACKGROUND_SYNC)
                     || (mCategory.showSites(SiteSettingsCategory.Type.COOKIES)
                             && ChromeFeatureList.isEnabled(
                                     ChromeFeatureList.ANDROID_SITE_SETTINGS_UI_REFRESH))
@@ -528,8 +527,6 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
         int resource = 0;
         if (mCategory.showSites(SiteSettingsCategory.Type.AUTOMATIC_DOWNLOADS)) {
             resource = R.string.website_settings_add_site_description_automatic_downloads;
-        } else if (mCategory.showSites(SiteSettingsCategory.Type.AUTOPLAY)) {
-            resource = R.string.website_settings_add_site_description_autoplay;
         } else if (mCategory.showSites(SiteSettingsCategory.Type.BACKGROUND_SYNC)) {
             resource = R.string.website_settings_add_site_description_background_sync;
         } else if (mCategory.showSites(SiteSettingsCategory.Type.JAVASCRIPT)) {
@@ -616,9 +613,6 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
         boolean exception = false;
         if (mCategory.showSites(SiteSettingsCategory.Type.SOUND)) {
             exception = true;
-        } else if (mCategory.showSites(SiteSettingsCategory.Type.AUTOPLAY)
-                && !WebsitePreferenceBridge.isCategoryEnabled(ContentSettingsType.AUTOPLAY)) {
-            exception = true;
         } else if (mCategory.showSites(SiteSettingsCategory.Type.JAVASCRIPT)
                 && (ChromeFeatureList.isEnabled(ChromeFeatureList.ANDROID_SITE_SETTINGS_UI_REFRESH)
                         || !WebsitePreferenceBridge.isCategoryEnabled(

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

@@ -76,7 +76,6 @@ public class SingleWebsitePreferences extends PreferenceFragmentCompat
             "ads_permission_list", // ContentSettingException.Type.ADS
             "automatic_downloads_permission_list",
             // ContentSettingException.Type.AUTOMATIC_DOWNLOADS
-            "autoplay_permission_list", // ContentSettingException.Type.AUTOPLAY
             "background_sync_permission_list", // ContentSettingException.Type.BACKGROUND_SYNC
             "bluetooth_scanning_permission_list", // ContentSettingException.Type.BLUETOOTH_SCANNING
             "cookies_permission_list", // ContentSettingException.Type.COOKIE

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java

@@ -37,11 +37,11 @@ import java.lang.annotation.RetentionPolicy;
  * A base class for dealing with website settings categories.
  */
 public class SiteSettingsCategory {
-    @IntDef({Type.ALL_SITES, Type.ADS, Type.AUTOMATIC_DOWNLOADS, Type.AUTOPLAY,
-            Type.BACKGROUND_SYNC, Type.BLUETOOTH_SCANNING, Type.CAMERA, Type.CLIPBOARD,
-            Type.COOKIES, Type.DEVICE_LOCATION, Type.JAVASCRIPT, Type.MICROPHONE, Type.NFC,
-            Type.NOTIFICATIONS, Type.POPUPS, Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND,
-            Type.USB, Type.USE_STORAGE})
+    @IntDef({Type.ALL_SITES, Type.ADS, Type.AUTOMATIC_DOWNLOADS, Type.BACKGROUND_SYNC,
+            Type.BLUETOOTH_SCANNING, Type.CAMERA, Type.CLIPBOARD, Type.COOKIES,
+            Type.DEVICE_LOCATION, Type.JAVASCRIPT, Type.MICROPHONE, Type.NFC, Type.NOTIFICATIONS,
+            Type.POPUPS, Type.PROTECTED_MEDIA, Type.SENSORS, Type.SOUND, Type.USB,
+            Type.USE_STORAGE})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Type {
         // Values used to address array index - should be enumerated from 0 and can't have gaps.
@@ -50,27 +50,26 @@ public class SiteSettingsCategory {
         int ALL_SITES = 0; // Always first as it should appear in the UI at the top.
         int ADS = 1;
         int AUTOMATIC_DOWNLOADS = 2;
-        int AUTOPLAY = 3;
-        int BACKGROUND_SYNC = 4;
-        int BLUETOOTH_SCANNING = 5;
-        int CAMERA = 6;
-        int CLIPBOARD = 7;
-        int COOKIES = 8;
-        int DEVICE_LOCATION = 9;
-        int JAVASCRIPT = 10;
-        int MICROPHONE = 11;
-        int NFC = 12;
-        int NOTIFICATIONS = 13;
-        int POPUPS = 14;
-        int PROTECTED_MEDIA = 15;
-        int SENSORS = 16;
-        int SOUND = 17;
-        int USB = 18;
-        int USE_STORAGE = 19; // Always last as it should appear in the UI at the bottom.
+        int BACKGROUND_SYNC = 3;
+        int BLUETOOTH_SCANNING = 4;
+        int CAMERA = 5;
+        int CLIPBOARD = 6;
+        int COOKIES = 7;
+        int DEVICE_LOCATION = 8;
+        int JAVASCRIPT = 9;
+        int MICROPHONE = 10;
+        int NFC = 11;
+        int NOTIFICATIONS = 12;
+        int POPUPS = 13;
+        int PROTECTED_MEDIA = 14;
+        int SENSORS = 15;
+        int SOUND = 16;
+        int USB = 17;
+        int USE_STORAGE = 18; // Always last as it should appear in the UI at the bottom.
         /**
          * Number of handled categories used for calculating array sizes.
          */
-        int NUM_ENTRIES = 20;
+        int NUM_ENTRIES = 19;
     }
 
     // The id of this category.
@@ -136,8 +135,6 @@ public class SiteSettingsCategory {
                 return ContentSettingsType.ADS;
             case Type.AUTOMATIC_DOWNLOADS:
                 return ContentSettingsType.AUTOMATIC_DOWNLOADS;
-            case Type.AUTOPLAY:
-                return ContentSettingsType.AUTOPLAY;
             case Type.BACKGROUND_SYNC:
                 return ContentSettingsType.BACKGROUND_SYNC;
             case Type.BLUETOOTH_SCANNING:
@@ -199,8 +196,6 @@ public class SiteSettingsCategory {
                 return "all_sites";
             case Type.AUTOMATIC_DOWNLOADS:
                 return "automatic_downloads";
-            case Type.AUTOPLAY:
-                return "autoplay";
             case Type.BACKGROUND_SYNC:
                 return "background_sync";
             case Type.BLUETOOTH_SCANNING:

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java

@@ -26,35 +26,17 @@ import java.util.List;
  * Microphone, etc. By clicking into one of these categories, the user can see or and modify
  * permissions that have been granted to websites, as well as enable or disable permissions
  * browser-wide.
- *
- * TODO(chouinard): The media sub-menu no longer needs to be modified programmatically based on
- * version/experiment so the organization of this menu should be simplified, probably by moving
- * Media to its own dedicated PreferenceFragment rather than sharing this one.
  */
 public class SiteSettingsPreferences
         extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener {
     // The keys for each category shown on the Site Settings page
-    // are defined in the SiteSettingsCategory, additional keys
-    // are listed here.
-    static final String MEDIA_KEY = "media";
-
-    // Whether this class is handling showing the Media sub-menu (and not the main menu).
-    boolean mMediaSubMenu;
+    // are defined in the SiteSettingsCategory.
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         PreferenceUtils.addPreferencesFromResource(this, R.xml.site_settings_preferences);
         getActivity().setTitle(R.string.prefs_site_settings);
 
-        if (getArguments() != null) {
-            String category =
-                    getArguments().getString(SingleCategoryPreferences.EXTRA_CATEGORY, "");
-            if (MEDIA_KEY.equals(category)) {
-                mMediaSubMenu = true;
-                getActivity().setTitle(findPreference(MEDIA_KEY).getTitle().toString());
-            }
-        }
-
         configurePreferences();
         updatePreferenceStates();
     }
@@ -70,65 +52,47 @@ public class SiteSettingsPreferences
     }
 
     private void configurePreferences() {
-        if (mMediaSubMenu) {
-            // The Media sub-menu only contains Protected Content and Autoplay, so remove all other
-            // menus.
-            for (@Type int i = 0; i < Type.NUM_ENTRIES; i++) {
-                if (i == Type.AUTOPLAY || i == Type.PROTECTED_MEDIA) continue;
-                getPreferenceScreen().removePreference(findPreference(i));
-            }
-            getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
-        } else {
-            // These will be tucked under the Media subkey, so don't show them on the main menu.
-            getPreferenceScreen().removePreference(findPreference(Type.AUTOPLAY));
-            getPreferenceScreen().removePreference(findPreference(Type.PROTECTED_MEDIA));
-
-            // TODO(csharrison): Remove this condition once the experimental UI lands. It is not
-            // great to dynamically remove the preference in this way.
-            if (!SiteSettingsCategory.adsCategoryEnabled()) {
-                getPreferenceScreen().removePreference(findPreference(Type.ADS));
-            }
-            CommandLine commandLine = CommandLine.getInstance();
-            if (!commandLine.hasSwitch(ContentSwitches.ENABLE_EXPERIMENTAL_WEB_PLATFORM_FEATURES)) {
-                getPreferenceScreen().removePreference(findPreference(Type.BLUETOOTH_SCANNING));
-            }
-            if (!ContentFeatureList.isEnabled(ContentFeatureList.WEB_NFC)) {
-                getPreferenceScreen().removePreference(findPreference(Type.NFC));
-            }
+        // TODO(csharrison): Remove this condition once the experimental UI lands. It is not
+        // great to dynamically remove the preference in this way.
+        if (!SiteSettingsCategory.adsCategoryEnabled()) {
+            getPreferenceScreen().removePreference(findPreference(Type.ADS));
+        }
+        CommandLine commandLine = CommandLine.getInstance();
+        if (!commandLine.hasSwitch(ContentSwitches.ENABLE_EXPERIMENTAL_WEB_PLATFORM_FEATURES)) {
+            getPreferenceScreen().removePreference(findPreference(Type.BLUETOOTH_SCANNING));
+        }
+        if (!ContentFeatureList.isEnabled(ContentFeatureList.WEB_NFC)) {
+            getPreferenceScreen().removePreference(findPreference(Type.NFC));
         }
     }
 
     private void updatePreferenceStates() {
         // Preferences that navigate to Website Settings.
         List<Integer> websitePrefs = new ArrayList<Integer>();
-        if (mMediaSubMenu) {
-            websitePrefs.add(Type.PROTECTED_MEDIA);
-            websitePrefs.add(Type.AUTOPLAY);
-        } else {
-            if (SiteSettingsCategory.adsCategoryEnabled()) {
-                websitePrefs.add(Type.ADS);
-            }
-            websitePrefs.add(Type.AUTOMATIC_DOWNLOADS);
-            websitePrefs.add(Type.BACKGROUND_SYNC);
-            CommandLine commandLine = CommandLine.getInstance();
-            if (commandLine.hasSwitch(ContentSwitches.ENABLE_EXPERIMENTAL_WEB_PLATFORM_FEATURES)) {
-                websitePrefs.add(Type.BLUETOOTH_SCANNING);
-            }
-            websitePrefs.add(Type.CAMERA);
-            websitePrefs.add(Type.CLIPBOARD);
-            websitePrefs.add(Type.COOKIES);
-            websitePrefs.add(Type.JAVASCRIPT);
-            websitePrefs.add(Type.DEVICE_LOCATION);
-            websitePrefs.add(Type.MICROPHONE);
-            if (ContentFeatureList.isEnabled(ContentFeatureList.WEB_NFC)) {
-                websitePrefs.add(Type.NFC);
-            }
-            websitePrefs.add(Type.NOTIFICATIONS);
-            websitePrefs.add(Type.POPUPS);
-            websitePrefs.add(Type.SENSORS);
-            websitePrefs.add(Type.SOUND);
-            websitePrefs.add(Type.USB);
+        if (SiteSettingsCategory.adsCategoryEnabled()) {
+            websitePrefs.add(Type.ADS);
+        }
+        websitePrefs.add(Type.AUTOMATIC_DOWNLOADS);
+        websitePrefs.add(Type.BACKGROUND_SYNC);
+        CommandLine commandLine = CommandLine.getInstance();
+        if (commandLine.hasSwitch(ContentSwitches.ENABLE_EXPERIMENTAL_WEB_PLATFORM_FEATURES)) {
+            websitePrefs.add(Type.BLUETOOTH_SCANNING);
         }
+        websitePrefs.add(Type.CAMERA);
+        websitePrefs.add(Type.CLIPBOARD);
+        websitePrefs.add(Type.COOKIES);
+        websitePrefs.add(Type.JAVASCRIPT);
+        websitePrefs.add(Type.DEVICE_LOCATION);
+        websitePrefs.add(Type.MICROPHONE);
+        if (ContentFeatureList.isEnabled(ContentFeatureList.WEB_NFC)) {
+            websitePrefs.add(Type.NFC);
+        }
+        websitePrefs.add(Type.NOTIFICATIONS);
+        websitePrefs.add(Type.POPUPS);
+        websitePrefs.add(Type.SENSORS);
+        websitePrefs.add(Type.PROTECTED_MEDIA);
+        websitePrefs.add(Type.SOUND);
+        websitePrefs.add(Type.USB);
 
         // Initialize the summary and icon for all preferences that have an
         // associated content settings entry.
@@ -187,8 +151,6 @@ public class SiteSettingsPreferences
 
         Preference p = findPreference(Type.ALL_SITES);
         if (p != null) p.setOnPreferenceClickListener(this);
-        p = findPreference(MEDIA_KEY);
-        if (p != null) p.setOnPreferenceClickListener(this);
         // TODO(finnur): Re-move this for Storage once it can be moved to the 'Usage' menu.
         p = findPreference(Type.USE_STORAGE);
         if (p != null) p.setOnPreferenceClickListener(this);

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java

@@ -119,8 +119,6 @@ public class WebsitePermissionsFetcher {
         queue.add(new ExceptionInfoFetcher(ContentSettingsType.BACKGROUND_SYNC));
         // Automatic Downloads permission is per-origin.
         queue.add(new ExceptionInfoFetcher(ContentSettingsType.AUTOMATIC_DOWNLOADS));
-        // Autoplay permission is per-origin.
-        queue.add(new ExceptionInfoFetcher(ContentSettingsType.AUTOPLAY));
         // USB device permission is per-origin and per-embedder.
         queue.add(new ChooserExceptionInfoFetcher(ContentSettingsType.USB_GUARD));
         // Clipboard info is per-origin.
@@ -202,9 +200,6 @@ public class WebsitePermissionsFetcher {
         } else if (category.showSites(SiteSettingsCategory.Type.PROTECTED_MEDIA)) {
             // Protected media identifier permission is per-origin and per-embedder.
             queue.add(new PermissionInfoFetcher(PermissionInfo.Type.PROTECTED_MEDIA_IDENTIFIER));
-        } else if (category.showSites(SiteSettingsCategory.Type.AUTOPLAY)) {
-            // Autoplay permission is per-origin.
-            queue.add(new ExceptionInfoFetcher(ContentSettingsType.AUTOPLAY));
         } else if (category.showSites(SiteSettingsCategory.Type.USB)) {
             // USB device permission is per-origin.
             queue.add(new ChooserExceptionInfoFetcher(ContentSettingsType.USB_GUARD));

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java

@@ -346,9 +346,6 @@ public class WebsitePreferenceBridge {
             case ContentSettingsType.AUTOMATIC_DOWNLOADS:
                 WebsitePreferenceBridgeJni.get().setAutomaticDownloadsEnabled(allow);
                 break;
-            case ContentSettingsType.AUTOPLAY:
-                WebsitePreferenceBridgeJni.get().setAutoplayEnabled(allow);
-                break;
             case ContentSettingsType.BACKGROUND_SYNC:
                 WebsitePreferenceBridgeJni.get().setBackgroundSyncEnabled(allow);
                 break;
@@ -400,8 +397,6 @@ public class WebsitePreferenceBridge {
                 return isContentSettingEnabled(contentSettingsType);
             case ContentSettingsType.AUTOMATIC_DOWNLOADS:
                 return WebsitePreferenceBridgeJni.get().getAutomaticDownloadsEnabled();
-            case ContentSettingsType.AUTOPLAY:
-                return WebsitePreferenceBridgeJni.get().getAutoplayEnabled();
             case ContentSettingsType.BACKGROUND_SYNC:
                 return WebsitePreferenceBridgeJni.get().getBackgroundSyncEnabled();
             case ContentSettingsType.COOKIES:
@@ -588,7 +583,6 @@ public class WebsitePreferenceBridge {
         boolean getAcceptCookiesUserModifiable();
         boolean getAcceptCookiesManagedByCustodian();
         boolean getAutomaticDownloadsEnabled();
-        boolean getAutoplayEnabled();
         boolean getBackgroundSyncEnabled();
         boolean getAllowLocationUserModifiable();
         boolean getLocationAllowedByPolicy();
@@ -604,7 +598,6 @@ public class WebsitePreferenceBridge {
         boolean getSensorsEnabled();
         boolean getSoundEnabled();
         void setAutomaticDownloadsEnabled(boolean enabled);
-        void setAutoplayEnabled(boolean enabled);
         void setAllowCookiesEnabled(boolean enabled);
         void setBackgroundSyncEnabled(boolean enabled);
         void setClipboardEnabled(boolean enabled);

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferencesTest.java

@@ -257,8 +257,6 @@ public class SiteSettingsPreferencesTest {
         preferenceActivity.finish();
     }
 
-    // TODO(finnur): Write test for Autoplay.
-
     /**
      * Tests that disabling cookies turns off the third-party cookie toggle.
      */
@@ -428,37 +426,6 @@ public class SiteSettingsPreferencesTest {
         preferenceActivity.finish();
     }
 
-    /**
-     * Test the Media Menu.
-     */
-    @Test
-    @SmallTest
-    @Feature({"Preferences"})
-    public void testMediaMenu() {
-        final Preferences preferenceActivity =
-                SiteSettingsTestUtils.startSiteSettingsMenu(SiteSettingsPreferences.MEDIA_KEY);
-        TestThreadUtils.runOnUiThreadBlocking(() -> {
-            SiteSettingsPreferences siteSettings =
-                    (SiteSettingsPreferences) preferenceActivity.getMainFragment();
-
-            SiteSettingsPreference allSites = (SiteSettingsPreference) siteSettings.findPreference(
-                    SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.ALL_SITES));
-            Assert.assertEquals(null, allSites);
-
-            SiteSettingsPreference autoplay = (SiteSettingsPreference) siteSettings.findPreference(
-                    SiteSettingsCategory.preferenceKey(SiteSettingsCategory.Type.AUTOPLAY));
-            Assert.assertFalse(autoplay == null);
-
-            SiteSettingsPreference protectedContent =
-                    (SiteSettingsPreference) siteSettings.findPreference(
-                            SiteSettingsCategory.preferenceKey(
-                                    SiteSettingsCategory.Type.PROTECTED_MEDIA));
-            Assert.assertFalse(protectedContent == null);
-
-            preferenceActivity.finish();
-        });
-    }
-
     /**
      * Tests that only expected Preferences are shown for a category.
      */
@@ -467,7 +434,7 @@ public class SiteSettingsPreferencesTest {
     @Feature({"Preferences"})
     public void testOnlyExpectedPreferencesShown() {
         // If you add a category in the SiteSettings UI, please add a test for it below.
-        Assert.assertEquals(20, SiteSettingsCategory.Type.NUM_ENTRIES);
+        Assert.assertEquals(19, SiteSettingsCategory.Type.NUM_ENTRIES);
 
         String[] nullArray = new String[0];
         String[] binaryToggle = new String[] {"binary_toggle"};
@@ -482,8 +449,6 @@ public class SiteSettingsPreferencesTest {
         testCases.put(SiteSettingsCategory.Type.ALL_SITES, new Pair<>(nullArray, nullArray));
         testCases.put(SiteSettingsCategory.Type.AUTOMATIC_DOWNLOADS,
                 new Pair<>(binaryToggleWithException, binaryToggle));
-        testCases.put(SiteSettingsCategory.Type.AUTOPLAY,
-                new Pair<>(binaryToggleWithException, binaryToggle));
         testCases.put(SiteSettingsCategory.Type.BACKGROUND_SYNC,
                 new Pair<>(binaryToggleWithException, binaryToggle));
         testCases.put(SiteSettingsCategory.Type.CAMERA, new Pair<>(binaryToggle, binaryToggle));

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcherTest.java

@@ -315,9 +315,6 @@ public class WebsitePermissionsFetcherTest {
         websitePreferenceBridge.addContentSettingException(
                 new ContentSettingException(ContentSettingsType.AUTOMATIC_DOWNLOADS, googleOrigin,
                         ContentSettingValues.DEFAULT, preferenceSource));
-        websitePreferenceBridge.addContentSettingException(
-                new ContentSettingException(ContentSettingsType.AUTOPLAY, googleOrigin,
-                        ContentSettingValues.DEFAULT, preferenceSource));
 
         // Add storage info.
         int storageSize = 256;
@@ -365,8 +362,6 @@ public class WebsitePermissionsFetcherTest {
             Assert.assertEquals(Integer.valueOf(ContentSettingValues.DEFAULT),
                     site.getContentSettingPermission(
                             ContentSettingException.Type.AUTOMATIC_DOWNLOADS));
-            Assert.assertEquals(Integer.valueOf(ContentSettingValues.DEFAULT),
-                    site.getContentSettingPermission(ContentSettingException.Type.AUTOPLAY));
 
             // Check storage info.
             ArrayList<StorageInfo> storageInfos = new ArrayList<>(site.getStorageInfo());
@@ -514,9 +509,9 @@ public class WebsitePermissionsFetcherTest {
         String preferenceSource = "preference";
         ArrayList<Integer> contentSettingExceptionTypes = new ArrayList<>(Arrays.asList(
                 ContentSettingException.Type.ADS, ContentSettingException.Type.AUTOMATIC_DOWNLOADS,
-                ContentSettingException.Type.AUTOPLAY, ContentSettingException.Type.BACKGROUND_SYNC,
-                ContentSettingException.Type.COOKIE, ContentSettingException.Type.JAVASCRIPT,
-                ContentSettingException.Type.POPUP, ContentSettingException.Type.SOUND));
+                ContentSettingException.Type.BACKGROUND_SYNC, ContentSettingException.Type.COOKIE,
+                ContentSettingException.Type.JAVASCRIPT, ContentSettingException.Type.POPUP,
+                ContentSettingException.Type.SOUND));
 
         for (@ContentSettingsType int type : contentSettingExceptionTypes) {
             @ContentSettingsType

chrome/browser/android/preferences/website_preference_bridge.cc

@@ -1063,10 +1063,6 @@ static jboolean JNI_WebsitePreferenceBridge_GetAcceptCookiesManagedByCustodian(
   return IsContentSettingManagedByCustodian(ContentSettingsType::COOKIES);
 }
 
-static jboolean JNI_WebsitePreferenceBridge_GetAutoplayEnabled(JNIEnv* env) {
-  return GetBooleanForContentSetting(ContentSettingsType::AUTOPLAY);
-}
-
 static jboolean JNI_WebsitePreferenceBridge_GetNfcEnabled(JNIEnv* env) {
   return GetBooleanForContentSetting(ContentSettingsType::NFC);
 }
@@ -1120,15 +1116,6 @@ static jboolean JNI_WebsitePreferenceBridge_GetAllowLocationManagedByCustodian(
   return IsContentSettingManagedByCustodian(ContentSettingsType::GEOLOCATION);
 }
 
-static void JNI_WebsitePreferenceBridge_SetAutoplayEnabled(JNIEnv* env,
-                                                           jboolean allow) {
-  HostContentSettingsMap* host_content_settings_map =
-      HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
-  host_content_settings_map->SetDefaultContentSetting(
-      ContentSettingsType::AUTOPLAY,
-      allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
-}
-
 static void JNI_WebsitePreferenceBridge_SetClipboardEnabled(JNIEnv* env,
                                                             jboolean allow) {
   HostContentSettingsMap* host_content_settings_map =

chrome/browser/ui/android/page_info/page_info_controller_android.cc

@@ -125,7 +125,6 @@ void PageInfoControllerAndroid::SetPermissionInfo(
   permissions_to_display.push_back(ContentSettingsType::ADS);
   permissions_to_display.push_back(
       ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER);
-  permissions_to_display.push_back(ContentSettingsType::AUTOPLAY);
   permissions_to_display.push_back(ContentSettingsType::SOUND);
   if (base::FeatureList::IsEnabled(features::kWebNfc))
     permissions_to_display.push_back(ContentSettingsType::NFC);

chrome/browser/ui/android/strings/android_chrome_strings.grd

@@ -922,9 +922,6 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_ADS_PERMISSION_TITLE" desc="Title for the ads permission [CHAR-LIMIT=32]">
          Ads
       </message>
-      <message name="IDS_AUTOPLAY_TITLE" desc='Title for the Autoplay settings screen [CHAR-LIMIT=32]'>
-        Autoplay
-      </message>
       <message name="IDS_COOKIES_TITLE" desc="Title for the Cookies settings screen [CHAR-LIMIT=32]">
         Cookies
       </message>
@@ -937,9 +934,6 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_JAVASCRIPT_PERMISSION_TITLE" desc="Title of the permission to run javascript [CHAR-LIMIT=32]">
         JavaScript
       </message>
-      <message name="IDS_MEDIA_PERMISSION_TITLE" desc="Title of the menu containing the media permissions [CHAR-LIMIT=32]">
-        Media
-      </message>
       <message name="IDS_POPUP_PERMISSION_TITLE" desc="Title of the permission to display pop-up windows and redirects [CHAR-LIMIT=32]">
         Pop-ups and redirects
       </message>
@@ -988,9 +982,6 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_TOAST" desc="The toast shown when a new site has been added to the whitelist.">
         Site <ph name="SITE_NAME">%1$s<ex>google.com</ex></ph> added
       </message>
-      <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DESCRIPTION_AUTOPLAY" desc="The description for the allow autoplay of muted videos for website dialog.">
-        Allow autoplay of muted videos for a specific site.
-      </message>
       <message name="IDS_WEBSITE_SETTINGS_ADD_SITE_DESCRIPTION_JAVASCRIPT_ALLOW" desc="The description for the allow Javascript for website dialog.">
         Allow JavaScript for a specific site.
       </message>
@@ -1069,9 +1060,6 @@ Your Google account may have other forms of browsing history like searches and a
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_COOKIE_ALLOWED" desc="Summary text explaining that sites are allowed to use cookies and that it is the recommended setting.">
         Allow sites to save and read cookie data (recommended)
       </message>
-      <message name="IDS_WEBSITE_SETTINGS_CATEGORY_AUTOPLAY_ALLOWED" desc="Summary text explaining that sites are allowed to automatically play muted videos and that it is the recommended setting.">
-        Allow sites to automatically play muted videos (recommended)
-      </message>
       <message name="IDS_WEBSITE_SETTINGS_CATEGORY_JAVASCRIPT_ALLOWED" desc="Summary text explaining that sites are allowed to run Javascript and that it is the recommended setting.">
         Allow sites to run JavaScript (recommended)
       </message>

chrome/browser/ui/page_info/page_info.cc

@@ -131,7 +131,6 @@ ContentSettingsType kPermissionType[] = {
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
     ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER,
 #endif
-    ContentSettingsType::AUTOPLAY,
     ContentSettingsType::MIDI_SYSEX,
     ContentSettingsType::CLIPBOARD_READ,
 #if defined(OS_ANDROID)
@@ -211,10 +210,6 @@ bool ShouldShowPermission(
     return true;
   }
 
-  // Autoplay is Android-only at the moment.
-  if (info.type == ContentSettingsType::AUTOPLAY)
-    return false;
-
   // NFC is Android-only at the moment.
   if (info.type == ContentSettingsType::NFC)
     return false;
@@ -1077,13 +1072,9 @@ void PageInfo::RecordPasswordReuseEvent() {
 
 std::vector<ContentSettingsType> PageInfo::GetAllPermissionsForTesting() {
   std::vector<ContentSettingsType> permission_list;
-  for (size_t i = 0; i < base::size(kPermissionType); ++i) {
-#if !defined(OS_ANDROID)
-    if (kPermissionType[i] == ContentSettingsType::AUTOPLAY)
-      continue;
-#endif
+  for (size_t i = 0; i < base::size(kPermissionType); ++i)
     permission_list.push_back(kPermissionType[i]);
-  }
+
   return permission_list;
 }
 

chrome/browser/ui/page_info/page_info_ui.cc

@@ -168,7 +168,6 @@ base::span<const PermissionsUIInfo> GetContentSettingsUIInfo() {
     {ContentSettingsType::PROTECTED_MEDIA_IDENTIFIER,
      IDS_PAGE_INFO_TYPE_PROTECTED_MEDIA_IDENTIFIER},
 #endif
-    {ContentSettingsType::AUTOPLAY, IDS_PAGE_INFO_TYPE_AUTOPLAY},
     {ContentSettingsType::ADS, IDS_PAGE_INFO_TYPE_ADS},
     {ContentSettingsType::SOUND, IDS_PAGE_INFO_TYPE_SOUND},
     {ContentSettingsType::CLIPBOARD_READ, IDS_PAGE_INFO_TYPE_CLIPBOARD},

components/page_info_strings.grdp

@@ -228,9 +228,6 @@
     <message name="IDS_PAGE_INFO_TYPE_PROTECTED_MEDIA_IDENTIFIER" desc="The label used for the protected media identifier permission controls in the Page Info popup.">
       Protected content
     </message>
-    <message name="IDS_PAGE_INFO_TYPE_AUTOPLAY" desc="The label used for the autoplay permission controls in the Page Info popup.">
-      Autoplay
-    </message>
     <message name="IDS_PAGE_INFO_TYPE_BACKGROUND_SYNC" desc="The label used for the background sync permission controls in the Page Info popup.">
       Background Sync
     </message>