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

components/plugins/renderer/loadable_plugin_placeholder.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/plugins/renderer/loadable_plugin_placeholder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/string_escape.h"
 #include "base/strings/string_piece.h"
@@ skipping 83 matching lines @@
 #endif
 }
 
 #if defined(ENABLE_PLUGINS)
 void LoadablePluginPlaceholder::MarkPluginEssential(
     PluginInstanceThrottler::PowerSaverUnthrottleMethod method) {
   if (plugin_marked_essential_)
     return;
 
   plugin_marked_essential_ = true;
+  power_saver_enabled_ = false;
   if (premade_throttler_)
     premade_throttler_->MarkPluginEssential(method);
   else
     PluginInstanceThrottler::RecordUnthrottleMethodMetric(method);
 
   if (is_blocked_for_power_saver_poster_) {
     is_blocked_for_power_saver_poster_ = false;
     if (!LoadingBlocked())
       LoadPlugin();
   }
@@ skipping 171 matching lines @@
     return;
   }
 
   if (premade_throttler_) {
     premade_throttler_->RemoveObserver(this);
     premade_throttler_->SetHiddenForPlaceholder(false /* hidden */);
 
     ReplacePlugin(premade_throttler_->GetWebPlugin());
     premade_throttler_ = nullptr;
   } else {
-    // TODO(mmenke):  In the case of prerendering, feed into
-    //                ChromeContentRendererClient::CreatePlugin instead, to
-    //                reduce the chance of future regressions.
-    scoped_ptr<PluginInstanceThrottler> throttler;
-#if defined(ENABLE_PLUGINS)
-    // If the plugin has already been marked essential in its placeholder form,
-    // we shouldn't create a new throttler and start the process all over again.
-    if (!plugin_marked_essential_ && power_saver_enabled_)
-      throttler = PluginInstanceThrottler::Create();
-#endif
-    WebPlugin* plugin = render_frame()->CreatePlugin(
-        GetFrame(), plugin_info_, GetPluginParams(), throttler.Pass());
-
-    ReplacePlugin(plugin);
+    ReplacePlugin(CreatePlugin());
   }
 }
 
 void LoadablePluginPlaceholder::LoadCallback() {
   RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Load_Click"));
 #if defined(ENABLE_PLUGINS)
   // If the user specifically clicks on the plugin content's placeholder,
   // disable power saver throttling for this instance.
   MarkPluginEssential(PluginInstanceThrottler::UNTHROTTLE_METHOD_BY_CLICK);
 #endif
@@ skipping 22 matching lines @@
 }
 
 const content::WebPluginInfo& LoadablePluginPlaceholder::GetPluginInfo() const {
   return plugin_info_;
 }
 
 void LoadablePluginPlaceholder::SetIdentifier(const std::string& identifier) {
   identifier_ = identifier;
 }
 
+const std::string& LoadablePluginPlaceholder::GetIdentifier() const {
+  return identifier_;
+}
+
 bool LoadablePluginPlaceholder::LoadingBlocked() const {
   DCHECK(allow_loading_);
   return is_blocked_for_background_tab_ || is_blocked_for_power_saver_poster_ ||
          is_blocked_for_prerendering_;
 }
 
 }  // namespace plugins