Merge pull request #700 from brave/mpilgrim_flash_2

Move Flash default to ContentSettingsRegistry
brave · Oct 22, 2018 · 8a70db5 · 8a70db5
2 parents a6f4f57 + 0ca311b
commit 8a70db5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 145 deletions.
diff --git a/chromium_src/components/content_settings/core/browser/content_settings_registry.cc b/chromium_src/components/content_settings/core/browser/content_settings_registry.cc
@@ -16,6 +16,22 @@ void ContentSettingsRegistry::BraveInit() {
            ContentSettingsInfo::INHERIT_IN_INCOGNITO,
            ContentSettingsInfo::PERSISTENT);
 
+  // Change plugins default to CONTENT_SETTING_BLOCK
+  content_settings_info_.erase(CONTENT_SETTINGS_TYPE_PLUGINS);
+  website_settings_registry_->UnRegister(CONTENT_SETTINGS_TYPE_PLUGINS);
+  Register(
+      CONTENT_SETTINGS_TYPE_PLUGINS, "plugins",
+      CONTENT_SETTING_BLOCK, WebsiteSettingsInfo::SYNCABLE,
+      WhitelistedSchemes(kChromeUIScheme, kChromeDevToolsScheme),
+      ValidSettings(CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK,
+                    CONTENT_SETTING_ASK,
+                    CONTENT_SETTING_DETECT_IMPORTANT_CONTENT),
+      WebsiteSettingsInfo::SINGLE_ORIGIN_WITH_EMBEDDED_EXCEPTIONS_SCOPE,
+      WebsiteSettingsRegistry::DESKTOP,
+      ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE,
+      base::FeatureList::IsEnabled(features::kEnableEphemeralFlashPermission)
+      ? ContentSettingsInfo::EPHEMERAL
+      : ContentSettingsInfo::PERSISTENT);
 }
 
 } // namespace content_settings
diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
@@ -6,8 +6,6 @@ source_set("browser") {
     "brave_content_settings_pref_provider.h",
     "brave_cookie_settings.cc",
     "brave_cookie_settings.h",
-    "brave_host_content_settings_map.cc",
-    "brave_host_content_settings_map.h",
   ]
 
   deps = [

diff --git a/components/content_settings/core/browser/brave_host_content_settings_map.cc b/components/content_settings/core/browser/brave_host_content_settings_map.cc
diff --git a/components/content_settings/core/browser/brave_host_content_settings_map.h b/components/content_settings/core/browser/brave_host_content_settings_map.h
diff --git a/components/content_settings/core/browser/brave_host_content_settings_map_unittest.cc b/components/content_settings/core/browser/brave_host_content_settings_map_unittest.cc
diff --git a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch
diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -58,7 +58,6 @@ test("brave_unit_tests") {
     "//brave/common/tor/tor_test_constants.h",
     "//brave/components/brave_shields/browser/ad_block_regional_service_unittest.cc",
     "//brave/components/brave_webtorrent/browser/net/brave_torrent_redirect_network_delegate_helper_unittest.cc",
-    "//brave/components/content_settings/core/browser/brave_host_content_settings_map_unittest.cc",
     "//chrome/common/importer/mock_importer_bridge.cc",
     "//chrome/common/importer/mock_importer_bridge.h",
     "../browser/importer/chrome_profile_lock_unittest.cc",