Remove UNSANDBOXED_PLUGINS from SiteSettings page.

Due to Flash/Plugins deprecation this CL removes UNSANDBOXED_PLUGINS
from the SiteSettings page.

Bug: 1138156
Change-Id: I443f9aa2626216dc0c1f357e70fb0e3f4e274119
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517688Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Illia Klimov <elklm@google.com>
Auto-Submit: Illia Klimov <elklm@google.com>
Cr-Commit-Position: refs/heads/master@{#825758}

chrome/app/settings_strings.grdp

@@ -1965,21 +1965,6 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_SOUND_BLOCKED_EXCEPTIONS" desc="Label for the blocked exceptions site list of the sound content setting.">
     Not allowed to play sound
   </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_DESCRIPTION" desc="Description of the unsandboxed plugins content setting.">
-    Sites usually use plugins for features like streaming videos or installing apps
-  </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ALLOWED" desc="Label for the enabled option of the unsandboxed plugins content setting.">
-    Sites can ask to use a plugin to access your computer (recommended)
-  </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCKED" desc="Label for the disabled option of the unsandboxed plugins content setting.">
-    Block plugins from accessing your computer
-  </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ALLOWED_EXCEPTIONS" desc="Label for the allowed exceptions site list of the unsandboxed plugins content setting.">
-    Allowed to use a plugin to access your computer
-  </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCKED_EXCEPTIONS" desc="Label for the blocked exceptions site list of the unsandboxed plugins content setting.">
-    Not allowed to use a plugin to access your computer
-  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_USB_DESCRIPTION" desc="Description of the USB devices content setting.">
     Sites usually connect to USB devices for features like printing a document or saving to a storage device
   </message>
@@ -2201,9 +2186,6 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_RECENT_ACTIVITY" desc="Label for the section which contains the user's recent permissions changes">
     Recent activity
   </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS" desc="Label for the unsandboxed plugin access site settings.">
-    Unsandboxed plugin access
-  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_MIDI_DEVICES" desc="Label for the MIDI devices in site settings.">
     MIDI devices
   </message>
@@ -2405,15 +2387,6 @@
   <message name="IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK" desc="The block label for automatic download in site settings.">
     Do not allow any site to download multiple files automatically
   </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK" desc="The allow label for unsandboxed plugins in site settings.">
-    Ask when a site wants to use a plugin to access your computer
-  </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK_RECOMMENDED" desc="The allow label for unsandboxed plugins in site settings (with the 'recommended' suffix).">
-    Ask when a site wants to use a plugin to access your computer (recommended)
-  </message>
-  <message name="IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCK" desc="The block label for unsandboxed plugins in site settings.">
-    Do not allow any site to use a plugin to access your computer
-  </message>
   <message name="IDS_SETTINGS_SITE_SETTINGS_WINDOW_PLACEMENT" desc="Label for the window placement site settings.">
     Window placement
   </message>

chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ALLOWED.png.sha1

-c0a918e270c8576e5fbe475d73922aa7149c519a
\ No newline at end of file

chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ALLOWED_EXCEPTIONS.png.sha1

-96f5ed39dbbb0e92de31fc015b52cdc9342b3a7d
\ No newline at end of file

chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCKED.png.sha1

-c0a918e270c8576e5fbe475d73922aa7149c519a
\ No newline at end of file

chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCKED_EXCEPTIONS.png.sha1

-96f5ed39dbbb0e92de31fc015b52cdc9342b3a7d
\ No newline at end of file

chrome/app/settings_strings_grdp/IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_DESCRIPTION.png.sha1

-c0a918e270c8576e5fbe475d73922aa7149c519a
\ No newline at end of file

chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

@@ -112,9 +112,6 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(example_url, example_url,
                                      ContentSettingsType::MEDIASTREAM_CAMERA));
-    EXPECT_EQ(CONTENT_SETTING_ASK,
-              map->GetContentSetting(example_url, example_url,
-                                     ContentSettingsType::PPAPI_BROKER));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(example_url, example_url,
                                      ContentSettingsType::AUTOMATIC_DOWNLOADS));
@@ -146,9 +143,6 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(url, url,
                                      ContentSettingsType::MEDIASTREAM_CAMERA));
-    EXPECT_EQ(
-        CONTENT_SETTING_BLOCK,
-        map->GetContentSetting(url, url, ContentSettingsType::PPAPI_BROKER));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(url, url,
                                      ContentSettingsType::AUTOMATIC_DOWNLOADS));
@@ -187,9 +181,6 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(url, url,
                                      ContentSettingsType::MEDIASTREAM_CAMERA));
-    EXPECT_EQ(
-        CONTENT_SETTING_ASK,
-        map->GetContentSetting(url, url, ContentSettingsType::PPAPI_BROKER));
     EXPECT_EQ(CONTENT_SETTING_ASK,
               map->GetContentSetting(url, url,
                                      ContentSettingsType::AUTOMATIC_DOWNLOADS));
@@ -225,8 +216,6 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
         map->GetContentSetting(url, url, ContentSettingsType::MEDIASTREAM_MIC));
     content_settings.push_back(map->GetContentSetting(
         url, url, ContentSettingsType::MEDIASTREAM_CAMERA));
-    content_settings.push_back(
-        map->GetContentSetting(url, url, ContentSettingsType::PPAPI_BROKER));
     content_settings.push_back(map->GetContentSetting(
         url, url, ContentSettingsType::AUTOMATIC_DOWNLOADS));
     content_settings.push_back(

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

@@ -706,48 +706,6 @@
           </settings-subpage>
        </template>
      </template>
-     <template is="dom-if" route-path="/content/unsandboxedPlugins" no-search>
-        <settings-subpage page-title="$i18n{siteSettingsUnsandboxedPlugins}"
-            search-label="$i18n{siteSettingsAllSitesSearch}"
-            search-term="{{searchFilter_}}">
-          <template is="dom-if" if="[[enableContentSettingsRedesign_]]">
-            <div class="content-settings-header">
-              <h2>$i18n{siteSettingsUnsandboxedPluginsDescription}</h2>
-            </div>
-            <settings-category-default-radio-group
-                category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]"
-                allow-option-label=
-                    "$i18n{siteSettingsUnsandboxedPluginsAllowed}"
-                allow-option-icon="cr:extension"
-                block-option-label=
-                    "$i18n{siteSettingsUnsandboxedPluginsBlocked}"
-                block-option-icon="settings:block">
-            </settings-category-default-radio-group>
-            <category-setting-exceptions
-                category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]"
-                allow-header=
-                    "$i18n{siteSettingsUnsandboxedPluginsAllowedExceptions}"
-                block-header=
-                    "$i18n{siteSettingsUnsandboxedPluginsBlockedExceptions}"
-                search-filter="[[searchFilter_]]">
-            </category-setting-exceptions>
-          </template>
-          <template is="dom-if" if="[[!enableContentSettingsRedesign_]]">
-            <category-default-setting
-                toggle-off-label="$i18n{siteSettingsUnsandboxedPluginsBlock}"
-                toggle-on-label=
-                    "$i18n{siteSettingsUnsandboxedPluginsAskRecommended}"
-                category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]">
-            </category-default-setting>
-            <category-setting-exceptions
-                category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]"
-                block-header="$i18n{siteSettingsBlock}"
-                allow-header="$i18n{siteSettingsAllow}"
-                search-filter="[[searchFilter_]]">
-            </category-setting-exceptions>
-          </template>
-        </settings-subpage>
-      </template>
       <template is="dom-if" route-path="/content/midiDevices" no-search>
         <settings-subpage page-title="$i18n{siteSettingsMidiDevices}"
             search-label="$i18n{siteSettingsAllSitesSearch}"

chrome/browser/resources/settings/route.js

@@ -55,8 +55,6 @@ function addPrivacyChildRoutes(r) {
   r.SITE_SETTINGS_MICROPHONE = r.SITE_SETTINGS.createChild('microphone');
   r.SITE_SETTINGS_NOTIFICATIONS = r.SITE_SETTINGS.createChild('notifications');
   r.SITE_SETTINGS_POPUPS = r.SITE_SETTINGS.createChild('popups');
-  r.SITE_SETTINGS_UNSANDBOXED_PLUGINS =
-      r.SITE_SETTINGS.createChild('unsandboxedPlugins');
   r.SITE_SETTINGS_MIDI_DEVICES = r.SITE_SETTINGS.createChild('midiDevices');
   r.SITE_SETTINGS_USB_DEVICES = r.SITE_SETTINGS.createChild('usbDevices');
   r.SITE_SETTINGS_HID_DEVICES = r.SITE_SETTINGS.createChild('hidDevices');

chrome/browser/resources/settings/settings_routes.js

@@ -74,7 +74,6 @@ import {Route} from './router.m.js';
  *   SITE_SETTINGS_PROTECTED_CONTENT: !Route,
  *   SITE_SETTINGS_SITE_DATA: !Route,
  *   SITE_SETTINGS_SITE_DETAILS: !Route,
- *   SITE_SETTINGS_UNSANDBOXED_PLUGINS: !Route,
  *   SITE_SETTINGS_USB_DEVICES: !Route,
  *   SITE_SETTINGS_SERIAL_PORTS: !Route,
  *   SITE_SETTINGS_VR: !Route,

chrome/browser/resources/settings/site_settings/README.md

@@ -36,9 +36,9 @@ localized to the language settings of the user. Examples:
 
 ```
 <site-details-permission
-  category="{{ContentSettingsTypes.UNSANDBOXED_PLUGINS}}"
-  icon="cr:extension" id="unsandboxedPlugins"
-  label="$i18n{siteSettingsUnsandboxedPlugins}">
+  category="{{ContentSettingsTypes.SITE_SETTINGS_SOUND}}"
+  icon="settings:volume-up" id="siteSettingsSound"
+  label="$i18n{siteSettingsSound}">
 </site-details-permission>
 ```
 

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

@@ -177,7 +177,6 @@ Polymer({
       case ContentSettingsTypes.GEOLOCATION:
       case ContentSettingsTypes.MIC:
       case ContentSettingsTypes.NOTIFICATIONS:
-      case ContentSettingsTypes.UNSANDBOXED_PLUGINS:
       case ContentSettingsTypes.MIDI_DEVICES:
       case ContentSettingsTypes.USB_DEVICES:
       case ContentSettingsTypes.SERIAL_PORTS:

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

@@ -38,7 +38,6 @@ export const ContentSettingsTypes = {
   SENSORS: 'sensors',
   SERIAL_PORTS: 'serial-ports',
   SOUND: 'sound',
-  UNSANDBOXED_PLUGINS: 'ppapi-broker',
   USB_DEVICES: 'usb-devices',
   VR: 'vr',
   WINDOW_PLACEMENT: 'window-placement',

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

@@ -101,7 +101,6 @@ Polymer({
       case ContentSettingsTypes.GEOLOCATION:
       case ContentSettingsTypes.MIC:
       case ContentSettingsTypes.NOTIFICATIONS:
-      case ContentSettingsTypes.UNSANDBOXED_PLUGINS:
       case ContentSettingsTypes.MIDI_DEVICES:
       case ContentSettingsTypes.USB_DEVICES:
       case ContentSettingsTypes.SERIAL_PORTS:

chrome/browser/resources/settings/site_settings/site_details.html

@@ -186,10 +186,6 @@
       <site-details-permission category="[[ContentSettingsTypes.HID_DEVICES]]"
           icon="settings:hid-device" label="$i18n{siteSettingsHidDevices}">
       </site-details-permission>
-      <site-details-permission
-          category="[[ContentSettingsTypes.UNSANDBOXED_PLUGINS]]"
-          icon="cr:extension" label="$i18n{siteSettingsUnsandboxedPlugins}">
-      </site-details-permission>
 <if expr="chromeos">
       <site-details-permission
           category="[[ContentSettingsTypes.PROTECTED_CONTENT]]"

chrome/browser/resources/settings/site_settings_page/recent_site_permissions.js

@@ -136,8 +136,6 @@ Polymer({
         return this.i18n('siteSettingsCamera');
       case ContentSettingsTypes.PROTOCOL_HANDLERS:
         return this.i18n('siteSettingsHandlers');
-      case ContentSettingsTypes.UNSANDBOXED_PLUGINS:
-        return this.i18n('siteSettingsUnsandboxedPlugins');
       case ContentSettingsTypes.AUTOMATIC_DOWNLOADS:
         return this.i18n('siteSettingsAutomaticDownloads');
       case ContentSettingsTypes.BACKGROUND_SYNC:

chrome/browser/resources/settings/site_settings_page/site_settings_page.js

@@ -275,14 +275,6 @@ function getCategoryItemMap() {
       enabledLabel: 'siteSettingsSoundAllow',
       disabledLabel: 'siteSettingsSoundBlock',
     },
-    {
-      route: routes.SITE_SETTINGS_UNSANDBOXED_PLUGINS,
-      id: Id.UNSANDBOXED_PLUGINS,
-      label: 'siteSettingsUnsandboxedPlugins',
-      icon: 'cr:extension',
-      enabledLabel: 'siteSettingsUnsandboxedPluginsAsk',
-      disabledLabel: 'siteSettingsUnsandboxedPluginsBlock',
-    },
     {
       route: routes.SITE_SETTINGS_USB_DEVICES,
       id: Id.USB_DEVICES,
@@ -366,7 +358,6 @@ Polymer({
           permissionsAdvanced: buildItemListFromIds([
             Id.SENSORS,
             Id.AUTOMATIC_DOWNLOADS,
-            Id.UNSANDBOXED_PLUGINS,
             Id.PROTOCOL_HANDLERS,
             Id.MIDI_DEVICES,
             Id.USB_DEVICES,

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

@@ -1683,8 +1683,6 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE_IDENTIFIERS},
 #endif
     {"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
-    {"siteSettingsUnsandboxedPlugins",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS},
     {"siteSettingsHidDevices", IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES},
     {"siteSettingsHidDevicesAsk", IDS_SETTINGS_SITE_SETTINGS_HID_DEVICES_ASK},
     {"siteSettingsHidDevicesAskRecommended",
@@ -1758,12 +1756,6 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK_RECOMMENDED},
     {"siteSettingsAutoDownloadBlock",
      IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK},
-    {"siteSettingsUnsandboxedPluginsAsk",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK},
-    {"siteSettingsUnsandboxedPluginsAskRecommended",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK_RECOMMENDED},
-    {"siteSettingsUnsandboxedPluginsBlock",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCK},
     {"siteSettingsDontShowImages", IDS_SETTINGS_SITE_SETTINGS_DONT_SHOW_IMAGES},
     {"siteSettingsShowAll", IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL},
     {"siteSettingsShowAllRecommended",
@@ -2115,16 +2107,6 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
      IDS_SETTINGS_SITE_SETTINGS_SOUND_ALLOWED_EXCEPTIONS},
     {"siteSettingsSoundBlockedExceptions",
      IDS_SETTINGS_SITE_SETTINGS_SOUND_BLOCKED_EXCEPTIONS},
-    {"siteSettingsUnsandboxedPluginsDescription",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_DESCRIPTION},
-    {"siteSettingsUnsandboxedPluginsAllowed",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ALLOWED},
-    {"siteSettingsUnsandboxedPluginsBlocked",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCKED},
-    {"siteSettingsUnsandboxedPluginsAllowedExceptions",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ALLOWED_EXCEPTIONS},
-    {"siteSettingsUnsandboxedPluginsBlockedExceptions",
-     IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCKED_EXCEPTIONS},
     {"siteSettingsUsbDescription", IDS_SETTINGS_SITE_SETTINGS_USB_DESCRIPTION},
     {"siteSettingsUsbAllowed", IDS_SETTINGS_SITE_SETTINGS_USB_ALLOWED},
     {"siteSettingsUsbBlocked", IDS_SETTINGS_SITE_SETTINGS_USB_BLOCKED},

chrome/common/extensions/docs/examples/api/contentSettings/popup.js

@@ -25,9 +25,10 @@ document.addEventListener('DOMContentLoaded', function () {
     var current = tabs[0];
     incognito = current.incognito;
     url = current.url;
-    var types = ['cookies', 'images', 'javascript', 'location', 'plugins',
-                 'popups', 'notifications', 'microphone', 'camera',
-                 'unsandboxedPlugins', 'automaticDownloads'];
+    var types = [
+      'cookies', 'images', 'javascript', 'location', 'popups', 'notifications',
+      'microphone', 'camera', 'automaticDownloads'
+    ];
     types.forEach(function(type) {
       // HACK: [type] is not recognised by the docserver's sample crawler, so
       // mention an explicit

chrome/test/data/extensions/api_test/content_settings/incognitoisolation/test.js

@@ -24,7 +24,6 @@ var settings = [
   'notifications',
   'microphone',
   'camera',
-  'unsandboxedPlugins',
   'automaticDownloads'
 ];
 

chrome/test/data/extensions/api_test/content_settings/standard/test.js

@@ -17,7 +17,6 @@ var default_content_settings = {
   "mouselock": "ask",
   "microphone": "ask",
   "camera": "ask",
-  "unsandboxedPlugins": "ask",
   "automaticDownloads": "ask"
 };
 
@@ -32,7 +31,6 @@ var settings = {
   "mouselock": "block",  // Should be ignored.
   "microphone": "block",
   "camera": "block",
-  "unsandboxedPlugins": "block",
   "automaticDownloads": "block"
 };
 

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

@@ -39,7 +39,6 @@ const redesignedPages = [
   routes.SITE_SETTINGS_SENSORS,
   routes.SITE_SETTINGS_SERIAL_PORTS,
   routes.SITE_SETTINGS_SOUND,
-  routes.SITE_SETTINGS_UNSANDBOXED_PLUGINS,
   routes.SITE_SETTINGS_USB_DEVICES,
   routes.SITE_SETTINGS_VR,
 

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

@@ -101,9 +101,6 @@ suite('SiteDetails', function() {
           createContentSettingTypeToValuePair(
               ContentSettingsTypes.CAMERA,
               [createRawSiteException('https://foo.com:443')]),
-          createContentSettingTypeToValuePair(
-              ContentSettingsTypes.UNSANDBOXED_PLUGINS,
-              [createRawSiteException('https://foo.com:443')]),
           createContentSettingTypeToValuePair(
               ContentSettingsTypes.AUTOMATIC_DOWNLOADS,
               [createRawSiteException('https://foo.com:443')]),