Remove ability for extensions to set/get/clear flash content settings.

Bug: 1142548
Change-Id: Id0275f770fb2ffa2070438a1d16581d725937fa3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517492Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Commit-Queue: Illia Klimov <elklm@google.com>
Auto-Submit: Illia Klimov <elklm@google.com>
Cr-Commit-Position: refs/heads/master@{#825399}

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

@@ -11,7 +11,6 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
@@ -33,8 +32,6 @@
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
-#include "components/content_settings/core/common/features.h"
-#include "components/permissions/features.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/webplugininfo.h"
@@ -84,6 +81,12 @@ ContentSettingsContentSettingClearFunction::Run() {
   std::unique_ptr<Clear::Params> params(Clear::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
+  if (content_type == ContentSettingsType::PLUGINS) {
+    return RespondNow(
+        Error(content_settings_api_constants::
+                  kSettingPluginContentSettingsClearIsDisallowed));
+  }
+
   ExtensionPrefsScope scope = kExtensionPrefsScopeRegular;
   bool incognito = false;
   if (params->details.scope ==
@@ -118,6 +121,11 @@ ContentSettingsContentSettingGetFunction::Run() {
   std::unique_ptr<Get::Params> params(Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
+  if (content_type == ContentSettingsType::PLUGINS) {
+    return RespondNow(Error(content_settings_api_constants::
+                                kSettingPluginContentSettingsGetIsDisallowed));
+  }
+
   GURL primary_url(params->details.primary_url);
   if (!primary_url.is_valid()) {
     return RespondNow(Error(content_settings_api_constants::kInvalidUrlError,
@@ -301,18 +309,8 @@ ContentSettingsContentSettingSetFunction::Run() {
   }
 
   if (content_type == ContentSettingsType::PLUGINS) {
-    if (base::FeatureList::IsEnabled(
-            content_settings::kDisallowExtensionsToSetPluginContentSettings)) {
       return RespondNow(Error(content_settings_api_constants::
                                   kSettingPluginContentSettingsIsDisallowed));
-    }
-    if (base::FeatureList::IsEnabled(
-            content_settings::kDisallowWildcardsInPluginContentSettings) &&
-        primary_pattern.HasHostWildcards()) {
-      WriteToConsole(blink::mojom::ConsoleMessageLevel::kError,
-                     content_settings_api_constants::
-                         kWildcardPatternsForPluginsDisallowed);
-    }
   }
 
   scoped_refptr<ContentSettingsStore> store =
@@ -334,38 +332,12 @@ ContentSettingsContentSettingGetResourceIdentifiersFunction::Run() {
   }
 
 #if BUILDFLAG(ENABLE_PLUGINS)
-  content::PluginService::GetInstance()->GetPlugins(base::BindOnce(
-      &ContentSettingsContentSettingGetResourceIdentifiersFunction::
-          OnGotPlugins,
-      this));
+  return RespondNow(
+      Error(content_settings_api_constants::
+                kSettingPluginContentSettingsResourceIdentifierIsDisallowed));
 #endif
 
   return RespondLater();
 }
 
-#if BUILDFLAG(ENABLE_PLUGINS)
-void ContentSettingsContentSettingGetResourceIdentifiersFunction::OnGotPlugins(
-    const std::vector<content::WebPluginInfo>& plugins) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  PluginFinder* finder = PluginFinder::GetInstance();
-  std::set<std::string> group_identifiers;
-  std::unique_ptr<base::ListValue> list(new base::ListValue());
-  for (auto it = plugins.cbegin(); it != plugins.cend(); ++it) {
-    std::unique_ptr<PluginMetadata> plugin_metadata(
-        finder->GetPluginMetadata(*it));
-    const std::string& group_identifier = plugin_metadata->identifier();
-    if (group_identifiers.find(group_identifier) != group_identifiers.end())
-      continue;
-
-    group_identifiers.insert(group_identifier);
-    std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
-    dict->SetString(content_settings_api_constants::kIdKey, group_identifier);
-    dict->SetString(content_settings_api_constants::kDescriptionKey,
-                    plugin_metadata->name());
-    list->Append(std::move(dict));
-  }
-  Respond(OneArgument(base::Value::FromUniquePtrValue(std::move(list))));
-}
-#endif  // BUILDFLAG(ENABLE_PLUGINS)
-
 }  // namespace extensions

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

@@ -28,6 +28,13 @@ const char kWildcardPatternsForPluginsDisallowed[] =
     "supported in `primaryPattern` for `plugins`.";
 const char kSettingPluginContentSettingsIsDisallowed[] =
     "`chrome.contentSettings.plugins.set()` API is no longer supported.";
+const char kSettingPluginContentSettingsResourceIdentifierIsDisallowed[] =
+    "`chrome.contentSettings.plugins.getResourceIdentifiers()` API is no "
+    "longer supported.";
+const char kSettingPluginContentSettingsGetIsDisallowed[] =
+    "`chrome.contentSettings.plugins.get()` API is no longer supported.";
+const char kSettingPluginContentSettingsClearIsDisallowed[] =
+    "`chrome.contentSettings.plugins.clear()` API is no longer supported.";
 
 }  // namespace content_settings_api_constants
 }  // namespace extensions

chrome/browser/extensions/api/content_settings/content_settings_api_constants.h

@@ -25,6 +25,9 @@ extern const char kIncognitoSessionOnlyError[];
 extern const char kInvalidUrlError[];
 extern const char kWildcardPatternsForPluginsDisallowed[];
 extern const char kSettingPluginContentSettingsIsDisallowed[];
+extern const char kSettingPluginContentSettingsResourceIdentifierIsDisallowed[];
+extern const char kSettingPluginContentSettingsGetIsDisallowed[];
+extern const char kSettingPluginContentSettingsClearIsDisallowed[];
 }  // namespace content_settings_api_constants
 }  // namespace extensions
 

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

@@ -94,7 +94,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(example_url, example_url,
                                      ContentSettingsType::JAVASCRIPT));
-    EXPECT_EQ(CONTENT_SETTING_ALLOW,
+    EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(example_url, example_url,
                                      ContentSettingsType::PLUGINS));
     EXPECT_EQ(CONTENT_SETTING_BLOCK,
@@ -130,7 +130,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
     EXPECT_EQ(
         CONTENT_SETTING_BLOCK,
         map->GetContentSetting(url, url, ContentSettingsType::JAVASCRIPT));
-    EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT,
+    EXPECT_EQ(CONTENT_SETTING_BLOCK,
               map->GetContentSetting(url, url, ContentSettingsType::PLUGINS));
     EXPECT_EQ(CONTENT_SETTING_ALLOW,
               map->GetContentSetting(url, url, ContentSettingsType::POPUPS));
@@ -274,9 +274,8 @@ class ExtensionContentSettingsApiTestWithStandardFeatures
     : public ExtensionContentSettingsApiLazyTest {
  public:
   ExtensionContentSettingsApiTestWithStandardFeatures() {
-    scoped_feature_list_.InitWithFeatures(
-        {}, {content_settings::kDisallowWildcardsInPluginContentSettings,
-             content_settings::kDisallowExtensionsToSetPluginContentSettings});
+    scoped_feature_list_.InitAndEnableFeature(
+        content_settings::kDisallowWildcardsInPluginContentSettings);
   }
 
  private:
@@ -316,37 +315,6 @@ IN_PROC_BROWSER_TEST_P(ExtensionContentSettingsApiTestWithStandardFeatures,
   CheckContentSettingsDefault();
 }
 
-// TODO(crbug.com/1073588): Make this test work in branded builds.
-// Pass the plugins to look for into the JS to make this test less
-// brittle or just have the JS side look for the additional plugins.
-//
-// Flaky on the trybots. See http://crbug.com/96725.
-IN_PROC_BROWSER_TEST_P(ExtensionContentSettingsApiLazyTest,
-                       DISABLED_GetResourceIdentifiers) {
-  base::FilePath::CharType kFooPath[] =
-      FILE_PATH_LITERAL("/plugins/foo.plugin");
-  base::FilePath::CharType kBarPath[] =
-      FILE_PATH_LITERAL("/plugins/bar.plugin");
-  const char kFooName[] = "Foo Plugin";
-  const char kBarName[] = "Bar Plugin";
-
-  content::PluginService::GetInstance()->RegisterInternalPlugin(
-      content::WebPluginInfo(base::ASCIIToUTF16(kFooName),
-                             base::FilePath(kFooPath),
-                             base::ASCIIToUTF16("1.2.3"),
-                             base::ASCIIToUTF16("foo")),
-      false);
-  content::PluginService::GetInstance()->RegisterInternalPlugin(
-    content::WebPluginInfo(base::ASCIIToUTF16(kBarName),
-                           base::FilePath(kBarPath),
-                           base::ASCIIToUTF16("2.3.4"),
-                           base::ASCIIToUTF16("bar")),
-      false);
-
-  EXPECT_TRUE(RunLazyTest("content_settings/getresourceidentifiers"))
-      << message_;
-}
-
 IN_PROC_BROWSER_TEST_P(ExtensionContentSettingsApiLazyTest,
                        UnsupportedDefaultSettings) {
   const char kExtensionPath[] = "content_settings/unsupporteddefaultsettings";
@@ -427,63 +395,12 @@ IN_PROC_BROWSER_TEST_P(ExtensionContentSettingsApiLazyTest,
       "ContentSettings.ExtensionNonEmbeddedSettingSet", 2);
 }
 
-class ExtensionContentSettingsApiTestWithWildcardMatchingDisabled
-    : public ExtensionContentSettingsApiLazyTest {
- public:
-  ExtensionContentSettingsApiTestWithWildcardMatchingDisabled() {
-    scoped_feature_list_.InitWithFeatures(
-        {content_settings::kDisallowWildcardsInPluginContentSettings},
-        {content_settings::kDisallowExtensionsToSetPluginContentSettings});
-  }
-
- private:
-  base::test::ScopedFeatureList scoped_feature_list_;
-};
-
-INSTANTIATE_TEST_SUITE_P(
-    EventPage,
-    ExtensionContentSettingsApiTestWithWildcardMatchingDisabled,
-    ::testing::Values(ContextType::kEventPage));
-
-INSTANTIATE_TEST_SUITE_P(
-    ServiceWorker,
-    ExtensionContentSettingsApiTestWithWildcardMatchingDisabled,
-    ::testing::Values(ContextType::kServiceWorker));
-
-IN_PROC_BROWSER_TEST_P(
-    ExtensionContentSettingsApiTestWithWildcardMatchingDisabled,
-    PluginTest) {
-  constexpr char kExtensionPath[] = "content_settings/pluginswildcardmatching";
-  EXPECT_TRUE(RunLazyTest(kExtensionPath)) << message_;
-}
-
-IN_PROC_BROWSER_TEST_P(
-    ExtensionContentSettingsApiTestWithWildcardMatchingDisabled,
-    ConsoleErrorTest) {
-  constexpr char kExtensionPath[] = "content_settings/pluginswildcardmatching";
-  const extensions::Extension* extension =
-      LoadExtension(test_data_dir_.AppendASCII(kExtensionPath));
-  ASSERT_TRUE(extension);
-  auto* web_contents = extensions::ProcessManager::Get(profile())
-                           ->GetBackgroundHostForExtension(extension->id())
-                           ->host_contents();
-  content::WebContentsConsoleObserver console_observer(web_contents);
-  console_observer.SetPattern(
-      content_settings_api_constants::kWildcardPatternsForPluginsDisallowed);
-  browsertest_util::ExecuteScriptInBackgroundPageNoWait(
-      profile(), extension->id(), "setWildcardedPatterns()");
-  console_observer.Wait();
-  EXPECT_EQ(1u, console_observer.messages().size());
-}
-
 class ExtensionContentSettingsApiTestWithPluginsApiDisabled
     : public ExtensionContentSettingsApiLazyTest {
  public:
   ExtensionContentSettingsApiTestWithPluginsApiDisabled() {
-    scoped_feature_list_.InitWithFeatures(
-        {content_settings::kDisallowWildcardsInPluginContentSettings,
-         content_settings::kDisallowExtensionsToSetPluginContentSettings},
-        {});
+    scoped_feature_list_.InitAndEnableFeature(
+        content_settings::kDisallowWildcardsInPluginContentSettings);
   }
 
  private:

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

@@ -427,6 +427,10 @@ void ContentSettingsStore::SetExtensionContentSettingFromList(
       // settings from the pref store when it is written back.
       continue;
     }
+    if (content_settings_type == ContentSettingsType::PLUGINS) {
+      // Plugin content settings are no longer supported for extensions.
+      continue;
+    }
 
     const content_settings::ContentSettingsInfo* info =
         content_settings::ContentSettingsRegistry::GetInstance()->Get(
@@ -444,12 +448,6 @@ void ContentSettingsStore::SetExtensionContentSettingFromList(
       // the pref store when it is written back.
       continue;
     }
-    if (base::FeatureList::IsEnabled(
-            content_settings::kDisallowExtensionsToSetPluginContentSettings) &&
-        content_settings_type == ContentSettingsType::PLUGINS) {
-      // Plugin content settings are no longer supported for extensions.
-      continue;
-    }
 
     std::string content_setting_string;
     dict->GetString(content_settings_api_constants::kContentSettingKey,

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

@@ -20,22 +20,21 @@ function expect(expected, message) {
 
 chrome.test.runTests([
   function testPluginsApi() {
-    cs['plugins'].set({
-      'primaryPattern': 'https://drive.google.com/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].set({
-      'primaryPattern': 'https://*.google.com:443/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
+    cs['plugins'].set(
+        {
+          'primaryPattern': 'https://*.google.com:443/*',
+          'secondaryPattern': '<all_urls>',
+          'setting': 'allow'
+        },
+        chrome.test.callbackFail(
+            '`chrome.contentSettings.plugins.set()` API is no longer supported.'));
     cs['plugins'].get(
         {'primaryUrl': 'https://drive.google.com:443/*'},
-        expect({'setting': 'block'}, 'Flash should be blocked on this page'));
-    cs['plugins'].get(
-        {'primaryUrl': 'http://mail.google.com:80/*'},
-        expect({'setting': 'block'}, 'Flash should be blocked on this page'));
-    cs['plugins'].clear({});
+        chrome.test.callbackFail(
+            '`chrome.contentSettings.plugins.get()` API is no longer supported.'));
+    cs['plugins'].clear(
+        {},
+        chrome.test.callbackFail(
+            '`chrome.contentSettings.plugins.clear()` API is no longer supported.'));
   },
 ]);
\ No newline at end of file

chrome/test/data/extensions/api_test/content_settings/pluginswildcardmatching/manifest.json

-{
-  "name" : "Content Settings API Test Extension",
-  "version" : "0.1",
-  "manifest_version": 2,
-  "description" : "Sets and checks exceptions to allow flash, ensures wildcard patterns are not allowed",
-  "background": {
-    "scripts": ["test.js"],
-    "persistent": false
-  },
-  "permissions": [ "contentSettings" ]
-}

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

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-var cs = chrome.contentSettings;
-
-function setWildcardedPatterns() {
-  cs['plugins'].set({
-    'primaryPattern': '<all_urls>',
-    'secondaryPattern': '<all_urls>',
-    'setting': 'allow'
-  });
-}
-
-function expect(expected, message) {
-  return chrome.test.callbackPass(function(value) {
-    chrome.test.assertEq(expected, value, message);
-  });
-}
-
-chrome.test.runTests([
-  function testSchemeWildcardMatching() {
-    cs['plugins'].set({
-      'primaryPattern': '*://drive.google.com:*/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].set({
-      'primaryPattern': 'https://maps.google.com:443/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].get(
-        {'primaryUrl': 'https://drive.google.com:443/*'},
-        expect({'setting': 'allow'}, 'Flash should be blocked on this page'));
-    cs['plugins'].get(
-        {'primaryUrl': 'http://drive.google.com:80/*'},
-        expect({'setting': 'allow'}, 'Flash should be blocked on this page'));
-    cs['plugins'].get(
-        {'primaryUrl': 'https://maps.google.com:443/*'},
-        expect({'setting': 'allow'}, 'Flash should be blocked on this page'));
-    cs['plugins'].clear({});
-  },
-  function testPortWildcardMatching() {
-    cs['plugins'].set({
-      'primaryPattern': 'https://drive.google.com:*/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].set({
-      'primaryPattern': 'https://maps.google.com:443/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].get(
-        {'primaryUrl': 'https://drive.google.com:100/'},
-        expect({'setting': 'allow'}, 'Flash should be allowed on this page'));
-    cs['plugins'].get(
-        {'primaryUrl': 'https://maps.google.com:443/'},
-        expect({'setting': 'allow'}, 'Flash should be allowed on this page'));
-    cs['plugins'].clear({});
-  },
-  function testSubdomainWildcardMatching() {
-    cs['plugins'].set({
-      'primaryPattern': 'https://*.google.com:443/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].get(
-        {'primaryUrl': 'http://drive.google.com:443/'},
-        expect({'setting': 'block'}, 'Flash should be blocked on this page'));
-    cs['plugins'].clear({});
-  },
-  function testFullWilcardMatching() {
-    cs['plugins'].set({
-      'primaryPattern': '<all_urls>',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].set({
-      'primaryPattern': 'https://*/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].set({
-      'primaryPattern': '*://*/*',
-      'secondaryPattern': '<all_urls>',
-      'setting': 'allow'
-    });
-    cs['plugins'].get(
-        {'primaryUrl': 'https://drive.google.com:443/'},
-        expect({'setting': 'block'}, 'Flash should be blocked on this page'));
-    cs['plugins'].get(
-        {'primaryUrl': 'https://example.com:443/'},
-        expect({'setting': 'block'}, 'Flash should be blocked on this page'));
-    cs['plugins'].clear({});
-  },
-]);
\ No newline at end of file

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

@@ -10,7 +10,6 @@ var default_content_settings = {
   "cookies": "session_only",
   "images": "allow",
   "javascript": "block",
-  "plugins": "allow",
   "popups": "block",
   "location": "ask",
   "notifications": "ask",
@@ -26,7 +25,6 @@ var settings = {
   "cookies": "block",
   "images": "allow",
   "javascript": "block",
-  "plugins": "detect_important_content",
   "popups": "allow",
   "location": "block",
   "notifications": "block",

components/content_settings/core/common/features.cc

@@ -19,8 +19,4 @@ const base::Feature kDisallowWildcardsInPluginContentSettings{
     "DisallowWildcardsInPluginContentSettings",
     base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kDisallowExtensionsToSetPluginContentSettings{
-    "DisallowExtensionsToSetPluginContentSettings",
-    base::FEATURE_ENABLED_BY_DEFAULT};
-
 }  // namespace content_settings

components/content_settings/core/common/features.h

@@ -24,11 +24,6 @@ extern const base::Feature kImprovedCookieControls;
 COMPONENT_EXPORT(CONTENT_SETTINGS_FEATURES)
 extern const base::Feature kDisallowWildcardsInPluginContentSettings;
 
-// Feature to remove the chrome.contentSettings.plugins.set() API in extensions
-// for extensions.
-COMPONENT_EXPORT(CONTENT_SETTINGS_FEATURES)
-extern const base::Feature kDisallowExtensionsToSetPluginContentSettings;
-
 }  // namespace content_settings
 
 #endif  // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_FEATURES_H_