Move browser-to-renderer opener plumbing to frame routing IDs

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d1a5260ed8d53fe55cd41c6fe4a1c3374ea967dc..5c776a4cbc4e37c0c60bee0c7b5abdf9cd427a53 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4034,12 +4034,12 @@ int WebContentsImpl::CreateSwappedOutRenderView(
     SiteInstance* instance) {
   int render_view_routing_id = MSG_ROUTING_NONE;
   if (RenderFrameHostManager::IsSwappedOutStateForbidden()) {
-    GetRenderManager()->CreateRenderFrameProxy(instance);
+    GetRenderManager()->CreateRenderFrameProxy(instance, true);
   } else {
     GetRenderManager()->CreateRenderFrame(
-        instance, nullptr, MSG_ROUTING_NONE,
+        instance, nullptr,
         CREATE_RF_SWAPPED_OUT | CREATE_RF_FOR_MAIN_FRAME_NAVIGATION |
-            CREATE_RF_HIDDEN,
+            CREATE_RF_HIDDEN | CREATE_RF_SUPPRESS_OPENER,
         &render_view_routing_id);
   }
   return render_view_routing_id;
@@ -4213,7 +4213,7 @@ NavigationEntry*
 
 bool WebContentsImpl::CreateRenderViewForRenderManager(
     RenderViewHost* render_view_host,
-    int opener_route_id,
+    int opener_frame_routing_id,
     int proxy_routing_id,
     const FrameReplicationState& replicated_frame_state,
     bool for_main_frame_navigation) {
@@ -4246,12 +4246,10 @@ bool WebContentsImpl::CreateRenderViewForRenderManager(
   int32 max_page_id =
       GetMaxPageIDForSiteInstance(render_view_host->GetSiteInstance());
 
-  if (!static_cast<RenderViewHostImpl*>(
-          render_view_host)->CreateRenderView(opener_route_id,
-                                              proxy_routing_id,
-                                              max_page_id,
-                                              replicated_frame_state,
-                                              created_with_opener_)) {
+  if (!static_cast<RenderViewHostImpl*>(render_view_host)
+           ->CreateRenderView(opener_frame_routing_id, proxy_routing_id,
+                              max_page_id, replicated_frame_state,
+                              created_with_opener_)) {
     return false;
   }