summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_content_settings_api.cc4
-rw-r--r--chrome/browser/extensions/extension_content_settings_apitest.cc2
2 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_content_settings_api.cc b/chrome/browser/extensions/extension_content_settings_api.cc
index 01dfee08..82305d3 100644
--- a/chrome/browser/extensions/extension_content_settings_api.cc
+++ b/chrome/browser/extensions/extension_content_settings_api.cc
@@ -262,9 +262,7 @@ bool GetResourceIdentifiersFunction::RunImpl() {
helpers::StringToContentSettingsType(content_type_str);
EXTENSION_FUNCTION_VALIDATE(content_type != CONTENT_SETTINGS_TYPE_DEFAULT);
- if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableResourceContentSettings)) {
+ if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) {
if (g_testing_plugin_groups_) {
OnGotPluginGroups(*g_testing_plugin_groups_);
} else {
diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/extension_content_settings_apitest.cc
index cae206c..9d7e568 100644
--- a/chrome/browser/extensions/extension_content_settings_apitest.cc
+++ b/chrome/browser/extensions/extension_content_settings_apitest.cc
@@ -93,8 +93,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
FLAKY_ContentSettingsGetResourceIdentifiers) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kEnableResourceContentSettings);
FilePath::CharType kFooPath[] = FILE_PATH_LITERAL("/plugins/foo.plugin");
FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin");