Plugin Power Saver: Implement option in Settings.

chrome/browser/prerender/prerender_browsertest.cc

Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index b01676aa0cae5b22a12af93a9af67b7d71d52c86..7f0a5ef205b6af216bcecba20f5cfc85b3372ab2 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -2040,17 +2040,22 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) {
 #if defined(USE_AURA) && !defined(OS_WIN)

[Lei Zhang, 2014/12/17 20:46:40]

Ouch, this is pretty painful to look at. Essentially the only platform that
still runs this test is 32-bit Windows. It's because the test plugin is a NPAPI
plugin, and there aren't many platforms where NPAPI still works. I'll file a bug
for converting this test to PPAPI, or something.

 // http://crbug.com/103496
 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
+#define MAYBE_PrerenderPluginPowerSaver DISABLED_PrerenderPluginPowerSaver
 #elif defined(OS_MACOSX)
 // http://crbug.com/100514
 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
+#define MAYBE_PrerenderPluginPowerSaver DISABLED_PrerenderPluginPowerSaver
 #elif defined(OS_WIN) && defined(ARCH_CPU_X86_64)
 // TODO(jschuh): Failing plugin tests. crbug.com/244653
 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
+#define MAYBE_PrerenderPluginPowerSaver DISABLED_PrerenderPluginPowerSaver
 #elif defined(OS_LINUX)
 // http://crbug.com/306715
 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
+#define MAYBE_PrerenderPluginPowerSaver DISABLED_PrerenderPluginPowerSaver
 #else
 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin
+#define MAYBE_PrerenderPluginPowerSaver PrerenderPluginPowerSaver
 #endif
 // http://crbug.com/306715
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) {
@@ -2060,18 +2065,17 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) {
   NavigateToDestURL();
 }
 
-// Checks that plugins are not loaded on prerendering pages when click-to-play
-// is enabled.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickToPlay) {
+// For enabled 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(PrerenderBrowserTest, MAYBE_PrerenderPluginPowerSaver) {
   // Enable click-to-play.
   HostContentSettingsMap* content_settings_map =
       current_browser()->profile()->GetHostContentSettingsMap();
   content_settings_map->SetDefaultContentSetting(
-      CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ASK);
+      CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
 
-  PrerenderTestURL("files/prerender/prerender_plugin_click_to_play.html",
-                   FINAL_STATUS_USED,
-                   1);
+  PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html",
+                   FINAL_STATUS_USED, 1);
   NavigateToDestURL();
 }