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

content/plugin/npobject_stub.h

 // 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.
 //
 // A class that receives IPC messages from an NPObjectProxy and calls the real
 // NPObject.
 
 #ifndef CONTENT_PLUGIN_NPOBJECT_STUB_H_
 #define CONTENT_PLUGIN_NPOBJECT_STUB_H_
 #pragma once
@@ skipping 20 matching lines @@
                      public base::SupportsWeakPtr<NPObjectStub>,
                      public NPObjectBase {
  public:
   NPObjectStub(NPObject* npobject,
                PluginChannelBase* channel,
                int route_id,
                gfx::NativeViewId containing_window,
                const GURL& page_url);
   virtual ~NPObjectStub();
 
-  // Cause the stub to ignore any further IPC messages, and to tear itself down
-  // the next time control returns to the message loop.
-  // The NPObject will be released only if |release_npobject| is true.
-  // This is used for the window script object stub in the renderer, which is
-  // freed with NPN_DeallocateObject to avoid leaks, and so we must not try to
-  // release it.
-  void DeleteSoon(bool release_npobject);
+  // Schedules tear-down of this stub.  The underlying NPObject reference is
+  // released, and further invokations form the IPC channel will fail once this
+  // call has returned.  Deletion of the stub is deferred to the main loop, in
+  // case it is touched as the stack unwinds.
+  void DeleteSoon();
 
   // IPC::Message::Sender implementation:
   virtual bool Send(IPC::Message* msg);
 
   // NPObjectBase implementation.
   virtual NPObject* GetUnderlyingNPObject();
   virtual IPC::Channel::Listener* GetChannelListener();
 
  private:
   // IPC::Channel::Listener implementation:
@@ skipping 30 matching lines @@
   NPObject* npobject_;
   scoped_refptr<PluginChannelBase> channel_;
   int route_id_;
   gfx::NativeViewId containing_window_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 };
 
 #endif  // CONTENT_PLUGIN_NPOBJECT_STUB_H_