Reland: Fix WebViewPlugin::scheduleAnimation crash

content/renderer/pepper/plugin_power_saver_helper.cc

 // Copyright 2014 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 "content/renderer/pepper/plugin_power_saver_helper.h"
 
+#include <string>
+
+#include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/common/frame_messages.h"
 #include "content/public/common/content_constants.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
 #include "ppapi/shared_impl/ppapi_constants.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
 namespace content {
 
 namespace {
@@ skipping 32 matching lines @@
 PluginPowerSaverHelper::PeripheralPlugin::PeripheralPlugin(
     const GURL& content_origin,
     const base::Closure& unthrottle_callback)
     : content_origin(content_origin), unthrottle_callback(unthrottle_callback) {
 }
 
 PluginPowerSaverHelper::PeripheralPlugin::~PeripheralPlugin() {
 }
 
 PluginPowerSaverHelper::PluginPowerSaverHelper(RenderFrame* render_frame)
-    : RenderFrameObserver(render_frame) {
+    : RenderFrameObserver(render_frame)
+    , override_for_testing_(Normal) {
+  base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
+  std::string override_for_testing = command_line.GetSwitchValueASCII(
+      switches::kOverridePluginPowerSaverForTesting);
+  if (override_for_testing == "never")
+    override_for_testing_ = Never;
+  else if (override_for_testing == "ignore-list")
+    override_for_testing_ = IgnoreList;
+  else if (override_for_testing == "always")
+    override_for_testing_ = Always;
 }
 
 PluginPowerSaverHelper::~PluginPowerSaverHelper() {
 }
 
 void PluginPowerSaverHelper::DidCommitProvisionalLoad(
     bool is_new_navigation,
     bool is_same_page_navigation) {
   blink::WebFrame* frame = render_frame()->GetWebFrame();
   // Only apply to top-level and new page navigation.
@@ skipping 42 matching lines @@
     const std::string& plugin_module_name,
     int width,
     int height,
     bool* cross_origin_main_content) const {
   DCHECK_EQ(content_origin.GetOrigin(), content_origin);
   if (cross_origin_main_content)
     *cross_origin_main_content = false;
 
   // This feature has only been tested throughly with Flash thus far.
   // It is also enabled for the Power Saver test plugin for browser tests.
-  if (plugin_module_name != content::kFlashPluginName &&
-      plugin_module_name != ppapi::kPowerSaverTestPluginName) {
+  if (override_for_testing_ == Always)

[jam, 2015/05/19 15:58:01]

nit: i think you need brace brackets here per style guide

+    return true;
+  else if (override_for_testing_ == Never)
     return false;
-  }
+  else if (override_for_testing_ == Normal &&
+           plugin_module_name != content::kFlashPluginName)
+    return false;
 
   if (width <= 0 || height <= 0)
     return false;
 
   // TODO(alexmos): Update this to use the origin of the RemoteFrame when 426512
   // is fixed. For now, case 3 in the class level comment doesn't work in
   // --site-per-process mode.
   blink::WebFrame* main_frame =
       render_frame()->GetWebFrame()->view()->mainFrame();
   if (main_frame->isWebRemoteFrame()) {
@@ skipping 37 matching lines @@
 void PluginPowerSaverHelper::WhitelistContentOrigin(
     const GURL& content_origin) {
   DCHECK_EQ(content_origin.GetOrigin(), content_origin);
   if (origin_whitelist_.insert(content_origin).second) {
     Send(new FrameHostMsg_PluginContentOriginAllowed(
         render_frame()->GetRoutingID(), content_origin));
   }
 }
 
 }  // namespace content