Remove the window script object tear-down special-case.

content/plugin/npobject_stub.cc

 // Copyright (c) 2011 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/plugin/npobject_stub.h"
 
 #include "content/common/content_client.h"
 #include "content/common/plugin_messages.h"
 #include "content/plugin/npobject_util.h"
 #include "content/plugin/plugin_channel_base.h"
@@ skipping 21 matching lines @@
 
   // We retain the object just as PluginHost does if everything was in-process.
   WebBindings::retainObject(npobject_);
 }
 
 NPObjectStub::~NPObjectStub() {
   channel_->RemoveRoute(route_id_);
   CHECK(!npobject_);
 }
 
-void NPObjectStub::DeleteSoon(bool release_npobject) {
+void NPObjectStub::DeleteSoon() {
   if (npobject_) {
     channel_->RemoveMappingForNPObjectStub(route_id_, npobject_);
 
     // We need to NULL npobject_ prior to calling releaseObject() to avoid
     // problems with re-entrancy. See http://crbug.com/94179#c17 for more
     // details on how this can happen.
     NPObject* npobject = npobject_;
     npobject_ = NULL;
 
-    if (release_npobject)
-      WebBindings::releaseObject(npobject);
+    WebBindings::releaseObject(npobject);
 
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   }
 }
 
 bool NPObjectStub::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
 NPObject* NPObjectStub::GetUnderlyingNPObject() {
@@ skipping 31 matching lines @@
     IPC_MESSAGE_HANDLER(NPObjectMsg_Enumeration, OnEnumeration);
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_Construct, OnConstruct);
     IPC_MESSAGE_HANDLER_DELAY_REPLY(NPObjectMsg_Evaluate, OnEvaluate);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void NPObjectStub::OnChannelError() {
-  DeleteSoon(true);
+  DeleteSoon();
 }
 
 void NPObjectStub::OnRelease(IPC::Message* reply_msg) {
   Send(reply_msg);
-  DeleteSoon(true);
+  DeleteSoon();
 }
 
 void NPObjectStub::OnHasMethod(const NPIdentifier_Param& name,
                                bool* result) {
   NPIdentifier id = CreateNPIdentifier(name);
   // If we're in the plugin process, then the stub is holding onto an NPObject
   // from the plugin, so all function calls on it need to go through the
   // functions in NPClass.  If we're in the renderer process, then we just call
   // the NPN_ functions.
   if (IsPluginProcess()) {
@@ skipping 264 matching lines @@
 
   bool return_value = WebBindings::evaluateHelper(0, popups_allowed, npobject_,
                                                   &script_string, &result_var);
 
   NPVariant_Param result_param;
   CreateNPVariantParam(
       result_var, channel_, &result_param, true, containing_window_, page_url_);
   NPObjectMsg_Evaluate::WriteReplyParams(reply_msg, result_param, return_value);
   channel_->Send(reply_msg);
 }