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/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/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"
@@ skipping 97 matching lines @@
 bool PluginPowerSaverHelper::ShouldThrottleContent(
     const GURL& content_origin,
     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;
 
+  if (plugin_module_name == content::kAlwaysThrottleTestPluginName)

[jam, 2015/05/18 15:44:04]

we shouldn't have knowledge of this test plugin name in shipping code.

can this be a command line flag instead, i.e. --always-throttle-plugins?

+    return true;
+
   // 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) {
     return false;
   }
 
   if (width <= 0 || height <= 0)
     return false;
 
@@ skipping 43 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