Commit de53a15d authored by Illia Klimov's avatar Illia Klimov Committed by Chromium LUCI CQ

Remove PLUGINS call sites.

Flash has been deprecated since M87. User-visible code was removed in
M88. In this CL, I remove the last ContentSettingsType::PLUGINS
non-critical call sites.

Bug: 1149393
Change-Id: I6436e9d3c34f6dfd578538e6a1e7df06ae3bbffe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584163
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarBalazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837690}
parent 5768461b
...@@ -53,9 +53,6 @@ void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage( ...@@ -53,9 +53,6 @@ void BrowserContentSettingBubbleModelDelegate::ShowLearnMorePage(
ContentSettingsType type) { ContentSettingsType type) {
GURL learn_more_url; GURL learn_more_url;
switch (type) { switch (type) {
case ContentSettingsType::PLUGINS:
learn_more_url = GURL(chrome::kBlockedPluginLearnMoreURL);
break;
case ContentSettingsType::ADS: case ContentSettingsType::ADS:
learn_more_url = GURL(subresource_filter::kLearnMoreLink); learn_more_url = GURL(subresource_filter::kLearnMoreLink);
break; break;
......
...@@ -229,39 +229,6 @@ class PageInfoBubbleViewTest : public testing::Test { ...@@ -229,39 +229,6 @@ class PageInfoBubbleViewTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(PageInfoBubbleViewTest); DISALLOW_COPY_AND_ASSIGN(PageInfoBubbleViewTest);
}; };
#if BUILDFLAG(ENABLE_PLUGINS)
// Waits until a change is observed in content settings.
class FlashContentSettingsChangeWaiter : public content_settings::Observer {
public:
explicit FlashContentSettingsChangeWaiter(Profile* profile)
: profile_(profile) {
HostContentSettingsMapFactory::GetForProfile(profile)->AddObserver(this);
}
~FlashContentSettingsChangeWaiter() override {
HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(
this);
}
// content_settings::Observer:
void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
const ContentSettingsPattern& secondary_pattern,
ContentSettingsType content_type) override {
if (content_type == ContentSettingsType::PLUGINS)
Proceed();
}
void Wait() { run_loop_.Run(); }
private:
void Proceed() { run_loop_.Quit(); }
Profile* profile_;
base::RunLoop run_loop_;
DISALLOW_COPY_AND_ASSIGN(FlashContentSettingsChangeWaiter);
};
#endif
} // namespace } // namespace
// Each permission selector row is like this: [icon] [label] [selector] // Each permission selector row is like this: [icon] [label] [selector]
......
...@@ -449,9 +449,6 @@ const char kChromeSyncLearnMoreURL[] = ...@@ -449,9 +449,6 @@ const char kChromeSyncLearnMoreURL[] =
#endif // BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN) #endif // BUILDFLAG(ENABLE_ONE_CLICK_SIGNIN)
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
const char kBlockedPluginLearnMoreURL[] =
"https://support.google.com/chrome/?p=ib_blocked_plugin";
const char kOutdatedPluginLearnMoreURL[] = const char kOutdatedPluginLearnMoreURL[] =
"https://support.google.com/chrome/?p=ib_outdated_plugin"; "https://support.google.com/chrome/?p=ib_outdated_plugin";
#endif #endif
......
...@@ -411,8 +411,6 @@ extern const char kChromeSyncLearnMoreURL[]; ...@@ -411,8 +411,6 @@ extern const char kChromeSyncLearnMoreURL[];
#endif #endif
#if BUILDFLAG(ENABLE_PLUGINS) #if BUILDFLAG(ENABLE_PLUGINS)
// The URL for the "Learn more" page for the blocked plugin infobar.
extern const char kBlockedPluginLearnMoreURL[];
// The URL for the "Learn more" page for the outdated plugin infobar. // The URL for the "Learn more" page for the outdated plugin infobar.
extern const char kOutdatedPluginLearnMoreURL[]; extern const char kOutdatedPluginLearnMoreURL[];
......
...@@ -124,7 +124,6 @@ TEST_F(ContentSettingsRegistryTest, Inheritance) { ...@@ -124,7 +124,6 @@ TEST_F(ContentSettingsRegistryTest, Inheritance) {
// disable features like popup blocking, download blocking or ad blocking. // disable features like popup blocking, download blocking or ad blocking.
// They do not allow access to user data. // They do not allow access to user data.
const ContentSettingsType safe_types[] = { const ContentSettingsType safe_types[] = {
ContentSettingsType::PLUGINS,
ContentSettingsType::POPUPS, ContentSettingsType::POPUPS,
ContentSettingsType::AUTOMATIC_DOWNLOADS, ContentSettingsType::AUTOMATIC_DOWNLOADS,
ContentSettingsType::ADS, ContentSettingsType::ADS,
......
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