Remove BrowserPlugin's -internal-attach method

content/common/browser_plugin/browser_plugin_messages.h

Index: content/common/browser_plugin/browser_plugin_messages.h
diff --git a/content/common/browser_plugin/browser_plugin_messages.h b/content/common/browser_plugin/browser_plugin_messages.h
index 25aed663c86fa4c453cd09708679fdb239ea2d93..c81c133848f725ac190c3b8407f0e17dd2cc39d2 100644
--- a/content/common/browser_plugin/browser_plugin_messages.h
+++ b/content/common/browser_plugin/browser_plugin_messages.h
@@ -8,7 +8,6 @@
 
 #include "base/basictypes.h"
 #include "base/process/process.h"
-#include "base/values.h"
 #include "content/common/content_export.h"
 #include "content/common/content_param_traits.h"
 #include "content/common/cursors/webcursor.h"
@@ -83,19 +82,19 @@ IPC_STRUCT_END()
 // This message is sent from BrowserPlugin to BrowserPluginGuest to issue an
 // edit command.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ExecuteEditCommand,
-                     int /* instance_id */,
-                     std::string /* command */)
+                    int /* browser_plugin_instance_id */,
+                    std::string /* command */)
 
 // This message must be sent just before sending a key event.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetEditCommandsForNextKeyEvent,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     std::vector<content::EditCommand> /* edit_commands */)
 
 // This message is sent from BrowserPlugin to BrowserPluginGuest whenever IME
 // composition state is updated.
 IPC_MESSAGE_ROUTED5(
     BrowserPluginHostMsg_ImeSetComposition,
-    int /* instance_id */,
+    int /* browser_plugin_instance_id */,
     std::string /* text */,
     std::vector<blink::WebCompositionUnderline> /* underlines */,
     int /* selectiont_start */,
@@ -104,67 +103,65 @@ IPC_MESSAGE_ROUTED5(
 // This message is sent from BrowserPlugin to BrowserPluginGuest to notify that
 // confirming the current composition is requested.
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_ImeConfirmComposition,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     std::string /* text */,
                     bool /* keep selection */)
 
 // Deletes the current selection plus the specified number of characters before
 // and after the selection or caret.
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_ExtendSelectionAndDelete,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     int /* before */,
                     int /* after */)
 
 // This message is sent to the browser process to indicate that a BrowserPlugin
-// has taken ownership of the lifetime of the guest of the given |instance_id|.
-// |params| is the state of the BrowserPlugin taking ownership of
-// the guest. If a guest doesn't already exist with the given |instance_id|,
-// a new one will be created.
-IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_Attach,
-                    int /* instance_id */,
-                    BrowserPluginHostMsg_Attach_Params /* params */,
-                    base::DictionaryValue /* extra_params */)
+// has taken ownership of the lifetime of the guest of the given
+// |browser_plugin_instance_id|. |params| is the state of the BrowserPlugin
+// taking ownership of the guest.
+IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_Attach,
+                    int /* browser_plugin_instance_id */,
+                    BrowserPluginHostMsg_Attach_Params /* params */)
 
 // Tells the guest to focus or defocus itself.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetFocus,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     bool /* enable */)
 
 // Sends an input event to the guest.
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_HandleInputEvent,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     gfx::Rect /* guest_window_rect */,
                     IPC::WebInputEventPointer /* event */)
 
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_CopyFromCompositingSurfaceAck,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     int /* request_id */,
                     SkBitmap)
 
 // Notify the guest renderer that some resources given to the embededer
 // are not used any more.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ReclaimCompositorResources,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     FrameHostMsg_ReclaimCompositorResources_Params /* params */)
 
 // When a BrowserPlugin has been removed from the embedder's DOM, it informs
 // the browser process to cleanup the guest.
 IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_PluginDestroyed,
-                    int /* instance_id */)
+                    int /* browser_plugin_instance_id */)
 
 // Tells the guest it has been shown or hidden.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetVisibility,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     bool /* visible */)
 
 // Tells the guest to change its background opacity.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_SetContentsOpaque,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     bool /* opaque */)
 
 // Tells the guest that a drag event happened on the plugin.
 IPC_MESSAGE_ROUTED5(BrowserPluginHostMsg_DragStatusUpdate,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     blink::WebDragStatus /* drag_status */,
                     content::DropData /* drop_data */,
                     blink::WebDragOperationsMask /* operation_mask */,
@@ -172,15 +169,16 @@ IPC_MESSAGE_ROUTED5(BrowserPluginHostMsg_DragStatusUpdate,
 
 // Sends a PointerLock Lock ACK to the BrowserPluginGuest.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_LockMouse_ACK,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     bool /* succeeded */)
 
 // Sends a PointerLock Unlock ACK to the BrowserPluginGuest.
-IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_UnlockMouse_ACK, int /* instance_id */)
+IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_UnlockMouse_ACK,
+                    int /* browser_plugin_instance_id */)
 
 // Sent when plugin's position has changed without UpdateRect.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_UpdateGeometry,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     gfx::Rect /* view_rect */)
 
 // -----------------------------------------------------------------------------
@@ -190,7 +188,7 @@ IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_UpdateGeometry,
 // to resize a guest plugin container so that the guest is relaid out
 // according to the new size.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest,
-                    int /* instance_id*/,
+                    int /* browser_plugin_instance_id*/,
                     BrowserPluginHostMsg_ResizeGuest_Params)
 
 // -----------------------------------------------------------------------------
@@ -198,44 +196,45 @@ IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest,
 
 // This message is sent in response to a completed attachment of a guest
 // to a BrowserPlugin.
-IPC_MESSAGE_CONTROL1(BrowserPluginMsg_Attach_ACK, int /* instance_id */)
+IPC_MESSAGE_CONTROL1(BrowserPluginMsg_Attach_ACK,
+                     int /* browser_plugin_instance_id */)
 
 // Once the swapped out guest RenderView has been created in the embedder render
 // process, the browser process informs the embedder of its routing ID.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_GuestContentWindowReady,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      int /* source_routing_id */)
 
 // When the guest crashes, the browser process informs the embedder through this
 // message.
 IPC_MESSAGE_CONTROL1(BrowserPluginMsg_GuestGone,
-                     int /* instance_id */)
+                     int /* browser_plugin_instance_id */)
 
 // When the user tabs to the end of the tab stops of a guest, the browser
 // process informs the embedder to tab out of the browser plugin.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_AdvanceFocus,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      bool /* reverse */)
 
 // When the guest starts/stops listening to touch events, it needs to notify the
 // plugin in the embedder about it.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_ShouldAcceptTouchEvents,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      bool /* accept */)
 
 // Inform the embedder of the cursor the guest wishes to display.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetCursor,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      content::WebCursor /* cursor */)
 
 // The guest has damage it wants to convey to the embedder so that it can
 // update its backing store.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_UpdateRect,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      BrowserPluginMsg_UpdateRect_Params)
 
 IPC_MESSAGE_CONTROL4(BrowserPluginMsg_CopyFromCompositingSurface,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      int /* request_id */,
                      gfx::Rect  /* source_rect */,
                      gfx::Size  /* dest_size */)
@@ -243,19 +242,19 @@ IPC_MESSAGE_CONTROL4(BrowserPluginMsg_CopyFromCompositingSurface,
 // Guest renders into an FBO with textures provided by the embedder.
 // BrowserPlugin shares mostly the same logic as out-of-process RenderFrames but
 // because BrowserPlugins implement custom a second level of routing logic,
-// the IPCs need to be annotated with an extra instance_id. These messages
-// provide that extra id.
+// the IPCs need to be annotated with an extra browser_plugin_instance_id. These
+// messages provide that extra id.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_BuffersSwapped,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      FrameMsg_BuffersSwapped_Params /* params */)
 
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_CompositorFrameSwapped,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      FrameMsg_CompositorFrameSwapped_Params /* params */)
 
 // Forwards a PointerLock Unlock request to the BrowserPlugin.
 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetMouseLock,
-                     int /* instance_id */,
+                     int /* browser_plugin_instance_id */,
                      bool /* enable */)
 
 // See comment about BrowserPluginMsg_BuffersSwapped and
@@ -266,5 +265,5 @@ IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_BuffersSwappedACK,
 
 // Acknowledge that we presented an ubercomp frame.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_CompositorFrameSwappedACK,
-                    int /* instance_id */,
+                    int /* browser_plugin_instance_id */,
                     FrameHostMsg_CompositorFrameSwappedACK_Params /* params */)