Plugin Power Saver: Make PPS work well with prerendered pages.

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 9d7ad23696629de25e8bb1acea0706ca3ba81abb..c448f48b6443b42e736904d8d2990824dafcde2c 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -103,6 +103,7 @@
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_interceptor.h"
 #include "net/url_request/url_request_job.h"
+#include "ppapi/shared_impl/ppapi_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
@@ -1108,7 +1109,9 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(switches::kPrerenderMode,
                                     switches::kPrerenderModeSwitchValueEnabled);
-    ASSERT_TRUE(ppapi::RegisterTestPlugin(command_line));
+    command_line->AppendSwitch(switches::kEnablePepperTesting);
+
+    ASSERT_TRUE(ppapi::RegisterPowerSaverTestPlugin(command_line));
   }
 
   void SetUpOnMainThread() override {
@@ -1968,8 +1971,8 @@ 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) {
-  PrerenderTestURL("files/prerender/plugin_delay_load.html", FINAL_STATUS_USED,
-                   1);
+  PrerenderTestURL("files/prerender/prerender_plugin_delay_load.html",
+                   FINAL_STATUS_USED, 1);
   NavigateToDestURL();
 }
 
@@ -1981,9 +1984,16 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingDetect) {
   content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_DETECT_IMPORTANT_CONTENT);
 
-  PrerenderTestURL("files/prerender/plugin_delay_load.html", FINAL_STATUS_USED,
-                   1);
+  PrerenderTestURL("files/prerender/prerender_plugin_power_saver.html",
+                   FINAL_STATUS_USED, 1);
+
+  DisableJavascriptCalls();
   NavigateToDestURL();
+  bool second_placeholder_present = false;
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      GetActiveWebContents(), "AwaitPluginPrerollAndPlaceholder();",
+      &second_placeholder_present));
+  EXPECT_TRUE(second_placeholder_present);
 }
 
 // For Content Setting BLOCK, checks that plugins are never loaded.
@@ -1993,8 +2003,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderContentSettingBlock) {
   content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                                  CONTENT_SETTING_BLOCK);
 
-  PrerenderTestURL("files/prerender/plugin_never_load.html", FINAL_STATUS_USED,
-                   1);
+  PrerenderTestURL("files/prerender/prerender_plugin_never_load.html",
+                   FINAL_STATUS_USED, 1);
   NavigateToDestURL();
 }