Plugin Power Saver: Fix (probably rare) crash in PepperPluginInstanceImpl.

content/renderer/pepper/pepper_plugin_instance_impl.cc

 // Copyright (c) 2012 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/pepper_plugin_instance_impl.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 562 matching lines @@
 
     if (!module_->IsProxied()) {
       PepperBrowserConnection* browser_connection =
           PepperBrowserConnection::Get(render_frame_);
       browser_connection->DidCreateInProcessInstance(
           pp_instance(),
           render_frame_->GetRoutingID(),
           container_->element().document().url(),
           GetPluginURL());
     }
-
-    PluginPowerSaverHelper* power_saver_helper =
-        render_frame_->plugin_power_saver_helper();
-    GURL content_origin = plugin_url_.GetOrigin();
-    blink::WebRect bounds = container_->element().boundsInViewportSpace();
-
-    bool cross_origin = false;
-    power_saver_enabled_ =
-        CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnablePluginPowerSaver) &&
-        IsFlashPlugin(module_.get()) &&
-        power_saver_helper->ShouldThrottleContent(
-            content_origin, bounds.width, bounds.height, &cross_origin);
-
-    if (power_saver_enabled_) {
-      power_saver_helper->RegisterPeripheralPlugin(
-          content_origin,
-          base::Bind(&PepperPluginInstanceImpl::DisablePowerSaverAndUnthrottle,
-                     weak_factory_.GetWeakPtr()));
-
-      throttler_.reset(new PepperPluginInstanceThrottler(
-          base::Bind(&PepperPluginInstanceImpl::SetPluginThrottled,
-                     weak_factory_.GetWeakPtr(), true /* throttled */)));
-    } else if (cross_origin) {
-      power_saver_helper->WhitelistContentOrigin(content_origin);
-    }
   }
 
   RendererPpapiHostImpl* host_impl = module_->renderer_ppapi_host();
   resource_creation_ = host_impl->CreateInProcessResourceCreationAPI(this);
 
   if (GetContentClient()->renderer() &&  // NULL in unit tests.
       GetContentClient()->renderer()->IsExternalPepperPlugin(module->name()))
     external_document_load_ = true;
 
   if (IsFlashPlugin(module_.get())) {
@@ skipping 249 matching lines @@
       "Flash.UsesGPU", is_xp * 4 + needs_gpu * 2 + prefs.is_webgl_supported, 8);
 #endif
 }
 
 bool PepperPluginInstanceImpl::Initialize(
     const std::vector<std::string>& arg_names,
     const std::vector<std::string>& arg_values,
     bool full_frame) {
   if (!render_frame_)
     return false;
+
+  PluginPowerSaverHelper* power_saver_helper =
+      render_frame_->plugin_power_saver_helper();
+  GURL content_origin = plugin_url_.GetOrigin();
+  blink::WebRect bounds = container_->element().boundsInViewportSpace();
+
+  bool cross_origin = false;
+  power_saver_enabled_ =
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnablePluginPowerSaver) &&
+      IsFlashPlugin(module_.get()) &&
+      power_saver_helper->ShouldThrottleContent(
+          content_origin, bounds.width, bounds.height, &cross_origin);
+
+  if (power_saver_enabled_) {
+    power_saver_helper->RegisterPeripheralPlugin(
+        content_origin,
+        base::Bind(&PepperPluginInstanceImpl::DisablePowerSaverAndUnthrottle,
+                   weak_factory_.GetWeakPtr()));
+
+    throttler_.reset(new PepperPluginInstanceThrottler(
+        base::Bind(&PepperPluginInstanceImpl::SetPluginThrottled,
+                   weak_factory_.GetWeakPtr(), true /* throttled */)));
+  } else if (cross_origin) {
+    power_saver_helper->WhitelistContentOrigin(content_origin);
+  }
+
   message_channel_ = MessageChannel::Create(this, &message_channel_object_);
 
   full_frame_ = full_frame;
 
   UpdateTouchEventRequest();
   container_->setWantsWheelEvents(IsAcceptingWheelEvents());
 
   SetGPUHistogram(ppapi::Preferences(PpapiPreferencesBuilder::Build(
                       render_frame_->render_view()->webkit_preferences())),
                   arg_names,
@@ skipping 2443 matching lines @@
   SendDidChangeView();
 }
 
 void PepperPluginInstanceImpl::DisablePowerSaverAndUnthrottle() {
   DCHECK(power_saver_enabled_);
   power_saver_enabled_ = false;
   SetPluginThrottled(false);
 }
 
 }  // namespace content