Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1201)

Unified Diff: chrome/browser/plugins/plugin_power_saver_browsertest.cc

Issue 2373893002: [HBD] Enable Plugin Power Saver on ALLOW for HBD feature flag on. (Closed)
Patch Set: refactor Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_power_saver_browsertest.cc
diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
index ee38fc76698c50f7292537821ec05c851ae5e7df..c191a36aaed136a0fb8932af507d544c1902e9fc 100644
--- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
+++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
@@ -12,6 +12,7 @@
#include "base/strings/stringprintf.h"
#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -20,6 +21,7 @@
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/test_switches.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/zoom/zoom_controller.h"
#include "content/public/browser/readback_types.h"
#include "content/public/browser/render_frame_host.h"
@@ -312,6 +314,14 @@ class PluginPowerSaverBrowserTest : public InProcessBrowserTest {
GetActiveWebContents()->GetMainFrame()));
}
+ // Loads a peripheral plugin (small cross origin) named 'plugin'.
+ void LoadPeripheralPlugin() {
+ LoadHTML(
+ "<object id='plugin' data='http://otherorigin.com/fake.swf' "
+ " type='application/x-shockwave-flash' width='400' height='100'>"
+ "</object>");
+ }
+
// Returns the background WebContents.
content::WebContents* LoadHTMLInBackgroundTab(const std::string& html) {
embedded_test_server()->RegisterRequestHandler(
@@ -463,6 +473,23 @@ IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, MAYBE_SmallCrossOrigin) {
SimulateClickAndAwaitMarkedEssential("plugin_poster", gfx::Point(50, 150));
}
+IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, ContentSettings) {
+ HostContentSettingsMap* content_settings_map =
+ HostContentSettingsMapFactory::GetForProfile(browser()->profile());
+
+ // Throttle on DETECT.
+ content_settings_map->SetDefaultContentSetting(
+ CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
+ LoadPeripheralPlugin();
+ VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
+
+ // Don't throttle on ALLOW.
+ content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_ALLOW);
+ LoadPeripheralPlugin();
+ VerifyPluginMarkedEssential(GetActiveWebContents(), "plugin");
+}
+
IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, SmallerThanPlayIcon) {
LoadHTML(
"<object id='plugin_16' type='application/x-shockwave-flash' "
@@ -634,10 +661,7 @@ IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest,
}
IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, ExpandingSmallPlugin) {
- LoadHTML(
- "<object id='plugin' data='http://otherorigin.com/fake.swf' "
- " type='application/x-shockwave-flash' width='400' height='80'>"
- "</object>");
+ LoadPeripheralPlugin();
VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
std::string script = "window.document.getElementById('plugin').height = 400;";
@@ -750,3 +774,27 @@ IN_PROC_BROWSER_TEST_F(PluginPowerSaverAllowTinyBrowserTest,
VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_1");
VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_2");
}
+
+// Separate test case with HTML By Default feature flag on.
+class PluginPowerSaverPreferHtmlBrowserTest
+ : public PluginPowerSaverBrowserTest {
+ public:
+ void SetUpInProcessBrowserTestFixture() override {
+ PluginPowerSaverBrowserTest::SetUpInProcessBrowserTestFixture();
+ feature_list.InitAndEnableFeature(features::kPreferHtmlOverPlugins);
+ }
+
+ private:
+ base::test::ScopedFeatureList feature_list;
+};
+
+IN_PROC_BROWSER_TEST_F(PluginPowerSaverPreferHtmlBrowserTest,
+ ThrottlePluginsOnAllowContentSetting) {
+ HostContentSettingsMap* content_settings_map =
+ HostContentSettingsMapFactory::GetForProfile(browser()->profile());
+
+ content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_ALLOW);
+ LoadPeripheralPlugin();
+ VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
+}
« no previous file with comments | « chrome/browser/plugins/plugin_info_message_filter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698