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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 2391823003: [HBD] Hardcode SEI threshold to 30 (for testers) (Closed)
Patch Set: fix one more test Created 4 years, 2 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/plugins_field_trial.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index f1edffd7cefa8cac9e2b59340f0ffa267acf13f5..e46b6fb1807463d503fdc441df24c45a3ad6e18e 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -1348,36 +1348,25 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) {
// Checks that plugins are not loaded while a page is being preloaded, but
// are loaded when the page is displayed.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) {
+ HostContentSettingsMap* content_settings_map =
+ HostContentSettingsMapFactory::GetForProfile(
+ current_browser()->profile());
+ content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_ALLOW);
+
PrerenderTestURL("/prerender/prerender_plugin_delay_load.html",
FINAL_STATUS_USED, 1);
NavigateToDestURL();
}
-// TODO(tommycli): Remove once we implement Plugin Power Saver on ALLOW.
-// See crbug.com/649814
-class PrerenderBrowserTestWithPluginPowerSaver : public PrerenderBrowserTest {
- public:
- PrerenderBrowserTestWithPluginPowerSaver() {}
- ~PrerenderBrowserTestWithPluginPowerSaver() override {}
-
- void SetUpInProcessBrowserTestFixture() override {
- PrerenderBrowserTest::SetUpInProcessBrowserTestFixture();
- feature_list.InitAndDisableFeature(features::kPreferHtmlOverPlugins);
- }
-
- private:
- base::test::ScopedFeatureList feature_list;
-};
-
// For Plugin Power Saver, checks that plugins are not loaded while
// a page is being preloaded, but are loaded when the page is displayed.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithPluginPowerSaver,
- PrerenderPluginPowerSaver) {
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderPluginPowerSaver) {
HostContentSettingsMap* content_settings_map =
HostContentSettingsMapFactory::GetForProfile(
current_browser()->profile());
- content_settings_map->SetDefaultContentSetting(
- CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
+ content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_ALLOW);
Reid Kleckner 2016/10/05 17:32:47 This change broke this test on all the Clang ToT W
PrerenderTestURL("/prerender/prerender_plugin_power_saver.html",
FINAL_STATUS_USED, 1);
@@ -1440,6 +1429,12 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) {
#endif
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
MAYBE_PrerenderIframeDelayLoadPlugin) {
+ HostContentSettingsMap* content_settings_map =
+ HostContentSettingsMapFactory::GetForProfile(
+ current_browser()->profile());
+ content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
+ CONTENT_SETTING_ALLOW);
+
PrerenderTestURL("/prerender/prerender_iframe_plugin_delay_load.html",
FINAL_STATUS_USED, 1);
NavigateToDestURL();
« no previous file with comments | « chrome/browser/plugins/plugins_field_trial.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698