Plugin Power Saver: Make Unthrottle metric collection more consistent

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 13 matching lines @@
 using base::UserMetricsAction;
 using blink::WebElement;
 using blink::WebLocalFrame;
 using blink::WebMouseEvent;
 using blink::WebNode;
 using blink::WebPlugin;
 using blink::WebPluginContainer;
 using blink::WebPluginParams;
 using blink::WebScriptSource;
 using blink::WebURLRequest;
+using content::PluginInstanceThrottler;
 using content::PluginPowerSaverMode;
 using content::RenderThread;
 
 namespace plugins {
 
 #if defined(ENABLE_PLUGINS)
 void LoadablePluginPlaceholder::BlockForPowerSaverPoster() {
   DCHECK(!is_blocked_for_power_saver_poster_);
   is_blocked_for_power_saver_poster_ = true;
 
   render_frame()->RegisterPeripheralPlugin(
       GURL(GetPluginParams().url).GetOrigin(),
       base::Bind(&LoadablePluginPlaceholder::DisablePowerSaverForInstance,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr(),
+                 PluginInstanceThrottler::UNTHROTTLE_METHOD_BY_WHITELIST));
 }
 #endif
 
 LoadablePluginPlaceholder::LoadablePluginPlaceholder(
     content::RenderFrame* render_frame,
     WebLocalFrame* frame,
     const WebPluginParams& params,
     const std::string& html_data,
     GURL placeholderDataUrl)
     : PluginPlaceholder(render_frame,
                         frame,
                         params,
                         html_data,
                         placeholderDataUrl),
       is_blocked_for_background_tab_(false),
       is_blocked_for_prerendering_(false),
       is_blocked_for_power_saver_poster_(false),
       power_saver_mode_(PluginPowerSaverMode::POWER_SAVER_MODE_ESSENTIAL),
       allow_loading_(false),
+      placeholder_was_replaced_(false),
       hidden_(false),
       finished_loading_(false),
       weak_factory_(this) {
 }
 
 LoadablePluginPlaceholder::~LoadablePluginPlaceholder() {
+#if defined(ENABLE_PLUGINS)
+  if (!placeholder_was_replaced_ && !is_blocked_for_prerendering_ &&
+      power_saver_mode_ != PluginPowerSaverMode::POWER_SAVER_MODE_ESSENTIAL) {
+    PluginInstanceThrottler::RecordUnthrottleMethodMetric(
+        PluginInstanceThrottler::UNTHROTTLE_METHOD_NEVER);
+  }
+#endif
 }
 
 #if defined(ENABLE_PLUGINS)
-void LoadablePluginPlaceholder::DisablePowerSaverForInstance() {
+void LoadablePluginPlaceholder::DisablePowerSaverForInstance(
+    PluginInstanceThrottler::PowerSaverUnthrottleMethod method) {
+  if (power_saver_mode_ == PluginPowerSaverMode::POWER_SAVER_MODE_ESSENTIAL)
+    return;
+
   power_saver_mode_ = PluginPowerSaverMode::POWER_SAVER_MODE_ESSENTIAL;
+  PluginInstanceThrottler::RecordUnthrottleMethodMetric(method);
   if (is_blocked_for_power_saver_poster_) {
     is_blocked_for_power_saver_poster_ = false;
     if (!LoadingBlocked())
       LoadPlugin();
   }
 }
 #endif
 
 gin::ObjectTemplateBuilder LoadablePluginPlaceholder::GetObjectTemplateBuilder(
     v8::Isolate* isolate) {
@@ skipping 30 matching lines @@
   // During initialization, the new plug-in might have replaced itself in turn
   // with another plug-in. Make sure not to use the passed in |new_plugin| after
   // this point.
   new_plugin = container->plugin();
 
   plugin()->RestoreTitleText();
   container->invalidate();
   container->reportGeometry();
   plugin()->ReplayReceivedData(new_plugin);
   plugin()->destroy();
+
+  placeholder_was_replaced_ = true;
 }
 
 void LoadablePluginPlaceholder::HidePlugin() {
   hidden_ = true;
   if (!plugin())
     return;
   WebPluginContainer* container = plugin()->container();
   WebElement element = container->element();
   element.setAttribute("style", "display: none;");
   // If we have a width and height, search for a parent (often <div>) with the
@@ skipping 94 matching lines @@
   if (!plugin())
     return;
   if (!allow_loading_) {
     NOTREACHED();
     return;
   }
 
   // TODO(mmenke):  In the case of prerendering, feed into
   //                ChromeContentRendererClient::CreatePlugin instead, to
   //                reduce the chance of future regressions.
-  scoped_ptr<content::PluginInstanceThrottler> throttler;
+  scoped_ptr<PluginInstanceThrottler> throttler;
 #if defined(ENABLE_PLUGINS)
-  throttler = content::PluginInstanceThrottler::Get(
+  throttler = PluginInstanceThrottler::Get(
       render_frame(), GetPluginParams().url, power_saver_mode_);
 #endif
   WebPlugin* plugin = render_frame()->CreatePlugin(
       GetFrame(), plugin_info_, GetPluginParams(), throttler.Pass());
   ReplacePlugin(plugin);
 }
 
 void LoadablePluginPlaceholder::LoadCallback() {
   RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Load_Click"));
 #if defined(ENABLE_PLUGINS)
   // If the user specifically clicks on the plug-in content's placeholder,
   // disable power saver throttling for this instance.
-  DisablePowerSaverForInstance();
+  DisablePowerSaverForInstance(
+      PluginInstanceThrottler::UNTHROTTLE_METHOD_BY_CLICK);
 #endif
   LoadPlugin();
 }
 
 void LoadablePluginPlaceholder::HideCallback() {
   RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Hide_Click"));
   HidePlugin();
 }
 
 void LoadablePluginPlaceholder::DidFinishLoadingCallback() {
@@ skipping 15 matching lines @@
   identifier_ = 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