Revert 130199 - Revert 128179 - Make sure the plugin scriptable object is released before NPP_Destr…

content/plugin/webplugin_delegate_stub.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 #define CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
+#include "content/common/npobject_stub.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 class PluginChannel;
 class WebPluginProxy;
 struct PluginMsg_Init_Params;
 struct PluginMsg_DidReceiveResponseParams;
@@ skipping 83 matching lines @@
   void OnHandleURLRequestReply(unsigned long resource_id,
                                const GURL& url,
                                int notify_id);
   void OnHTTPRangeRequestReply(unsigned long resource_id, int range_request_id);
 
   std::string mime_type_;
   int instance_id_;
 
   scoped_refptr<PluginChannel> channel_;
 
+  base::WeakPtr<NPObjectStub> plugin_scriptable_object_;
   webkit::npapi::WebPluginDelegateImpl* delegate_;
   WebPluginProxy* webplugin_;
   bool in_destructor_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
 #if defined(ENABLE_GPU)
 #if defined(OS_MACOSX)
   // If this is a GPU-accelerated plug-in, we need to be able to receive a fake
   // window handle which is used for subsequent communication back to the
   // browser.
   void OnSetFakeAcceleratedSurfaceWindowHandle(gfx::PluginWindowHandle window);
 #endif
 #endif
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebPluginDelegateStub);
 };
 
 #endif  // CONTENT_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_