Commit 8d84ed47 authored by Ravjit Singh Uppal's avatar Ravjit Singh Uppal Committed by Commit Bot

Flip the feature flag for disallowing wildcards patterns in flash to enabled by default

Bug: 1073883, 1103143
Change-Id: Ib4121c2fea110ae13f490faffeb113a609e6b81e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2279796Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Commit-Queue: Ravjit Singh Uppal <ravjit@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786235}
parent 8d0066e7
...@@ -205,7 +205,7 @@ TEST_F(PolicyProviderTest, ResourceIdentifier) { ...@@ -205,7 +205,7 @@ TEST_F(PolicyProviderTest, ResourceIdentifier) {
profile.GetTestingPrefService(); profile.GetTestingPrefService();
auto value = std::make_unique<base::ListValue>(); auto value = std::make_unique<base::ListValue>();
value->AppendString("[*.]google.com"); value->AppendString("http://mail.google.com:80");
prefs->SetManagedPref(prefs::kManagedPluginsAllowedForUrls, std::move(value)); prefs->SetManagedPref(prefs::kManagedPluginsAllowedForUrls, std::move(value));
PolicyProvider provider(prefs); PolicyProvider provider(prefs);
......
...@@ -96,7 +96,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest { ...@@ -96,7 +96,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
map->GetContentSetting(example_url, example_url, map->GetContentSetting(example_url, example_url,
ContentSettingsType::JAVASCRIPT, std::string())); ContentSettingsType::JAVASCRIPT, std::string()));
EXPECT_EQ( EXPECT_EQ(
CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
map->GetContentSetting(example_url, example_url, map->GetContentSetting(example_url, example_url,
ContentSettingsType::PLUGINS, std::string())); ContentSettingsType::PLUGINS, std::string()));
EXPECT_EQ( EXPECT_EQ(
...@@ -141,7 +141,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest { ...@@ -141,7 +141,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
EXPECT_EQ(CONTENT_SETTING_BLOCK, EXPECT_EQ(CONTENT_SETTING_BLOCK,
map->GetContentSetting(url, url, ContentSettingsType::JAVASCRIPT, map->GetContentSetting(url, url, ContentSettingsType::JAVASCRIPT,
std::string())); std::string()));
EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, EXPECT_EQ(CONTENT_SETTING_BLOCK,
map->GetContentSetting(url, url, ContentSettingsType::PLUGINS, map->GetContentSetting(url, url, ContentSettingsType::PLUGINS,
std::string())); std::string()));
EXPECT_EQ(CONTENT_SETTING_ALLOW, EXPECT_EQ(CONTENT_SETTING_ALLOW,
......
...@@ -19,7 +19,6 @@ var settings = [ ...@@ -19,7 +19,6 @@ var settings = [
'cookies', 'cookies',
'images', 'images',
'javascript', 'javascript',
'plugins',
'popups', 'popups',
'location', 'location',
'notifications', 'notifications',
......
...@@ -26,7 +26,7 @@ var settings = { ...@@ -26,7 +26,7 @@ var settings = {
"cookies": "block", "cookies": "block",
"images": "allow", "images": "allow",
"javascript": "block", "javascript": "block",
"plugins": "detect_important_content", "plugins": "block", // <all_urls> exception can't be defined for plugins
"popups": "allow", "popups": "allow",
"location": "block", "location": "block",
"notifications": "block", "notifications": "block",
......
...@@ -24,6 +24,6 @@ const base::Feature kImprovedCookieControlsForThirdPartyCookieBlocking{ ...@@ -24,6 +24,6 @@ const base::Feature kImprovedCookieControlsForThirdPartyCookieBlocking{
const base::Feature kDisallowWildcardsInPluginContentSettings{ const base::Feature kDisallowWildcardsInPluginContentSettings{
"DisallowWildcardsInPluginContentSettings", "DisallowWildcardsInPluginContentSettings",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
} // namespace content_settings } // namespace content_settings
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment