Move allocate instance id to chrome/.

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 32e8f29bd63a0bf2286961476b27c088ca1748e3..8a4bb2d26648685f6df07d34bb1d936440a0a2cc 100644
--- a/content/common/browser_plugin/browser_plugin_messages.h
+++ b/content/common/browser_plugin/browser_plugin_messages.h
@@ -56,23 +56,15 @@ IPC_STRUCT_BEGIN(BrowserPluginHostMsg_ResizeGuest_Params)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_Attach_Params)
-  IPC_STRUCT_MEMBER(std::string, storage_partition_id)
-  IPC_STRUCT_MEMBER(bool, persist_storage)
   IPC_STRUCT_MEMBER(bool, focused)
   IPC_STRUCT_MEMBER(bool, visible)
   IPC_STRUCT_MEMBER(bool, opaque)
-  IPC_STRUCT_MEMBER(std::string, src)
   IPC_STRUCT_MEMBER(GURL, embedder_frame_url)
   IPC_STRUCT_MEMBER(BrowserPluginHostMsg_AutoSize_Params, auto_size_params)
   IPC_STRUCT_MEMBER(BrowserPluginHostMsg_ResizeGuest_Params,
                     resize_guest_params)
 IPC_STRUCT_END()
 
-IPC_STRUCT_BEGIN(BrowserPluginMsg_Attach_ACK_Params)
-  IPC_STRUCT_MEMBER(std::string, storage_partition_id)
-  IPC_STRUCT_MEMBER(bool, persist_storage)
-IPC_STRUCT_END()
-
 IPC_STRUCT_BEGIN(BrowserPluginMsg_UpdateRect_Params)
   // The size of the RenderView when this message was generated.  This is
   // included so the host knows how large the view is from the perspective of
@@ -94,12 +86,6 @@ IPC_STRUCT_END()
 // -----------------------------------------------------------------------------
 // These messages are from the embedder to the browser process.
 
-// This message is sent to the browser process to request an instance ID.
-// |request_id| is used by BrowserPluginEmbedder to route the response back
-// to its origin.
-IPC_MESSAGE_ROUTED1(BrowserPluginHostMsg_AllocateInstanceID,
-                    int /* request_id */)
-
 // This message is sent from BrowserPlugin to BrowserPluginGuest to issue an
 // edit command.
 IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ExecuteEditCommand,
@@ -164,15 +150,6 @@ IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_HandleInputEvent,
                     gfx::Rect /* guest_window_rect */,
                     IPC::WebInputEventPointer /* event */)
 
-// A BrowserPlugin sends this to BrowserPluginEmbedder (browser process) when it
-// wants to navigate to a given src URL. If a guest WebContents already exists,
-// it will navigate that WebContents. If not, it will create the WebContents,
-// associate it with the BrowserPluginGuest, and navigate it to the requested
-// URL.
-IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_NavigateGuest,
-                    int /* instance_id*/,
-                    std::string /* src */)
-
 IPC_MESSAGE_ROUTED3(BrowserPluginHostMsg_CopyFromCompositingSurfaceAck,
                     int /* instance_id */,
                     int /* request_id */,
@@ -233,19 +210,10 @@ IPC_MESSAGE_ROUTED2(BrowserPluginHostMsg_ResizeGuest,
 // -----------------------------------------------------------------------------
 // These messages are from the browser process to the embedder.
 
-// This message is sent from the browser process to the embedder render process
-// in response to a request to allocate an instance ID. The |request_id| is used
-// to route the response to the requestor.
-IPC_MESSAGE_ROUTED2(BrowserPluginMsg_AllocateInstanceID_ACK,
-                    int /* request_id */,
-                    int /* instance_id */)
-
 // This message is sent in response to a completed attachment of a guest
-// to a BrowserPlugin. This message carries information about the guest
-// that is used to update the attributes of the browser plugin.
-IPC_MESSAGE_CONTROL2(BrowserPluginMsg_Attach_ACK,
-                     int /* instance_id */,
-                     BrowserPluginMsg_Attach_ACK_Params /* params */)
+// to a BrowserPlugin.
+IPC_MESSAGE_CONTROL1(BrowserPluginMsg_Attach_ACK,
+                     int /* 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.