Remove BrowserPlugin's -internal-attach method

content/renderer/browser_plugin/browser_plugin.h

Index: content/renderer/browser_plugin/browser_plugin.h
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index ee606a1781c5d0d95e3ef046e92f7cf81b43b946..7de7c0aaf569322d5c11f8f61d083f6d38f2b7b9 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -79,15 +79,15 @@ class CONTENT_EXPORT BrowserPlugin :
   void EnableCompositing(bool enable);
 
   // Provided that a guest instance ID has been allocated, this method attaches
-  // this BrowserPlugin instance to that guest. |extra_params| are parameters
-  // passed in by the content embedder to the browser process.
-  void Attach(int guest_instance_id,
-              scoped_ptr<base::DictionaryValue> extra_params);
+  // this BrowserPlugin instance to that guest.
+  void Attach(int guest_instance_id);
 
   // Notify the plugin about a compositor commit so that frame ACKs could be
   // sent, if needed.
   void DidCommitCompositorFrame();
 
+  static BrowserPlugin* FromNode(blink::WebNode& node);
+
   // Returns whether a message should be forwarded to BrowserPlugin.
   static bool ShouldForwardToBrowserPlugin(const IPC::Message& message);
 
@@ -196,7 +196,7 @@ class CONTENT_EXPORT BrowserPlugin :
   // IPC message handlers.
   // Please keep in alphabetical order.
   void OnAdvanceFocus(int instance_id, bool reverse);
-  void OnAttachACK(int instance_id);
+  void OnAttachACK(int guest_instance_id);
   void OnBuffersSwapped(int instance_id,
                         const FrameMsg_BuffersSwapped_Params& params);
   void OnCompositorFrameSwapped(const IPC::Message& message);
@@ -257,6 +257,9 @@ class CONTENT_EXPORT BrowserPlugin :
   // Used to identify the plugin to WebBindings.
   scoped_ptr<struct _NPP> npp_;
 
+  // URL for the embedder frame.
+  int browser_plugin_instance_id_;
+
   std::vector<EditCommand> edit_commands_;
 
   // Weak factory used in v8 |MakeWeak| callback, since the v8 callback might