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

content/browser/renderer_host/render_view_host_impl.cc

Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index b8f7d86a2042e518542d64e82a7352dc9a5d3916..129be655bf5e7716594eebe10b89f30ed11c0f85 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -208,10 +208,12 @@ content::SiteInstance* RenderViewHostImpl::GetSiteInstance() const {
   return instance_;
 }
 
-bool RenderViewHostImpl::CreateRenderView(const string16& frame_name,
-                                          int opener_route_id,
-                                          int32 max_page_id,
-                                          int embedder_process_id) {
+bool RenderViewHostImpl::CreateRenderView(
+    const string16& frame_name,
+    int opener_route_id,
+    int32 max_page_id,
+    const std::string& embedder_channel_name,
+    int embedder_container_id) {
   DCHECK(!IsRenderViewLive()) << "Creating view twice";
 
   // The process may (if we're sharing a process with another host that already
@@ -260,12 +262,8 @@ bool RenderViewHostImpl::CreateRenderView(const string16& frame_name,
       WebKit::WebScreenInfoFactory::screenInfo(
           gfx::NativeViewFromId(GetNativeViewId()));
 #endif
-
-  if (embedder_process_id != -1) {
-    params.embedder_channel_name =
-        StringPrintf("%d.r%d", GetProcess()->GetID(), embedder_process_id);
-  }
-
+  params.embedder_channel_name = embedder_channel_name;
+  params.embedder_container_id = embedder_container_id;
   params.accessibility_mode =
       BrowserAccessibilityState::GetInstance()->IsAccessibleBrowser() ?
           AccessibilityModeComplete :