Index: components/plugins/renderer/loadable_plugin_placeholder.cc |
diff --git a/components/plugins/renderer/loadable_plugin_placeholder.cc b/components/plugins/renderer/loadable_plugin_placeholder.cc |
index d3af1fc35ed33950dcd428f25b0ff939ddc7c2d9..b1567c8642c58ba5b93a648374b355056d57bd1d 100644 |
--- a/components/plugins/renderer/loadable_plugin_placeholder.cc |
+++ b/components/plugins/renderer/loadable_plugin_placeholder.cc |
@@ -292,20 +292,7 @@ void LoadablePluginPlaceholder::LoadPlugin() { |
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 (power_saver_enabled_) |
- throttler = PluginInstanceThrottler::Create(); |
-#endif |
- WebPlugin* plugin = render_frame()->CreatePlugin( |
- GetFrame(), plugin_info_, GetPluginParams(), throttler.Pass()); |
- |
- ReplacePlugin(plugin); |
+ ReplacePlugin(CreatePlugin()); |
} |
} |
@@ -348,6 +335,10 @@ 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_ || |