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

content/browser/renderer_host/render_view_host_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 187 matching lines @@
 }
 
 content::RenderViewHostDelegate* RenderViewHostImpl::GetDelegate() const {
   return delegate_;
 }
 
 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
   // initialized it) or may not (we have our own process or the old process
   // crashed) have been initialized. Calling Init multiple times will be
   // ignored, so this is safe.
   if (!GetProcess()->Init())
     return false;
   DCHECK(GetProcess()->HasConnection());
   DCHECK(GetProcess()->GetBrowserContext());
@@ skipping 28 matching lines @@
         GetView())->GetScreenInfo(&params.screen_info);
   } else {
     content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
         &params.screen_info);
   }
 #else
   params.screen_info =
       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 :
           AccessibilityModeOff;
 
 #if defined(OS_WIN)
   // On Windows 8, always enable accessibility for editable text controls
   // so we can show the virtual keyboard when one is enabled.
   if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
       params.accessibility_mode == AccessibilityModeOff) {
@@ skipping 1565 matching lines @@
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 }
 
 void RenderViewHostImpl::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }
 
 }  // namespace content