Revert 202364 "Track NPObject ownership by the originating plugi..."

trunk/src/content/renderer/webplugin_delegate_proxy.h

 // 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_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #define CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 50 matching lines @@
   virtual void PluginDestroyed() OVERRIDE;
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
                           webkit::npapi::WebPlugin* plugin,
                           bool load_manually) OVERRIDE;
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
                               const gfx::Rect& clip_rect) OVERRIDE;
   virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
   virtual NPObject* GetPluginScriptableObject() OVERRIDE;
-  virtual struct _NPP* GetPluginNPP() OVERRIDE;
   virtual bool GetFormValue(string16* value) OVERRIDE;
   virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
                                        int notify_id) OVERRIDE;
   virtual void SetFocus(bool focused) OVERRIDE;
   virtual bool HandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebCursor::CursorInfo* cursor) OVERRIDE;
   virtual int GetProcessId() OVERRIDE;
 
   // Informs the plugin that its containing content view has gained or lost
   // first responder status.
@@ skipping 178 matching lines @@
   std::string mime_type_;
   int instance_id_;
   webkit::WebPluginInfo info_;
 
   gfx::Rect plugin_rect_;
   gfx::Rect clip_rect_;
 
   NPObject* npobject_;
   base::WeakPtr<NPObjectStub> window_script_object_;
 
-  // Dummy NPP used to uniquely identify this plugin.
-  scoped_ptr<NPP_t> npp_;
-
   // Event passed in by the plugin process and is used to decide if messages
   // need to be pumped in the NPP_HandleEvent sync call.
   scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_;
 
   // Bitmap for crashed plugin
   SkBitmap* sad_plugin_;
 
   // True if we got an invalidate from the plugin and are waiting for a paint.
   bool invalidate_pending_;
 
@@ skipping 14 matching lines @@
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_