Browser Plugin: Remove MapInstance from BrowserPluginHost + More cross-process navigation work

content/common/view_messages.h

Index: content/common/view_messages.h
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index d64536b0a38473922eec853429c9f399c26ed494..04f8c0ddfd36eb71974bba8ec45a72def5a2ca85 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -629,6 +629,16 @@ IPC_STRUCT_BEGIN(ViewMsg_Navigate_Params)
 
   // Whether or not we should allow the url to download.
   IPC_STRUCT_MEMBER(bool, allow_download)
+
+  // The name of the channel with which a guest talks to its embedder.
+  // If this newly created RenderView has no embedder this string will be
+  // empty.
+  IPC_STRUCT_MEMBER(std::string, embedder_channel_name)
+
+  // The identifier in the embedder render process of the container hosting this
+  // guest RenderView. The embedder_channel_name and embedder_container_id
+  // together uniquely identify a browser plugin instance.
+  IPC_STRUCT_MEMBER(int, embedder_container_id)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(ViewMsg_New_Params)
@@ -673,6 +683,11 @@ IPC_STRUCT_BEGIN(ViewMsg_New_Params)
   // empty.
   IPC_STRUCT_MEMBER(std::string, embedder_channel_name)
 
+  // The identifier in the embedder render process of the container hosting this
+  // guest RenderView. The embedder_channel_name and embedder_container_id
+  // together uniquely identify a browser plugin instance.
+  IPC_STRUCT_MEMBER(int, embedder_container_id)
+
   // The accessibility mode of the renderer.
   IPC_STRUCT_MEMBER(AccessibilityMode, accessibility_mode)
 IPC_STRUCT_END()