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

content/renderer/browser_plugin/browser_plugin_channel_manager.cc

Index: content/renderer/browser_plugin/browser_plugin_channel_manager.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_channel_manager.cc b/content/renderer/browser_plugin/browser_plugin_channel_manager.cc
index ec6365c3d39931555af93e8b1f608f0c7b7710fc..678af1c6c8b001c5cd4bf8ef2e10aa1c97995c24 100644
--- a/content/renderer/browser_plugin/browser_plugin_channel_manager.cc
+++ b/content/renderer/browser_plugin/browser_plugin_channel_manager.cc
@@ -23,31 +23,30 @@ BrowserPluginChannelManager::~BrowserPluginChannelManager() {
 
 void BrowserPluginChannelManager::CreateRenderView(
     const ViewMsg_New_Params& params) {
-  IPC::ChannelHandle plugin_handle;
-  plugin_handle.name =
+  IPC::ChannelHandle embedder_channel_handle;
+  embedder_channel_handle.name =
       IPC::Channel::GenerateVerifiedChannelID(params.embedder_channel_name);
   bool success = true;
   scoped_refptr<GuestToEmbedderChannel> channel =
       GetChannelByName(params.embedder_channel_name);
   if (!channel) {
-    channel = new GuestToEmbedderChannel(params.embedder_channel_name);
-    success = channel->InitChannel(plugin_handle);
+    channel = new GuestToEmbedderChannel(params.embedder_channel_name,
+                                         embedder_channel_handle.name);
+    success = channel->InitChannel(embedder_channel_handle);
 
 #if defined(OS_POSIX)
     // On POSIX, transfer ownership of the renderer-side (client) FD.
     // This ensures this process will be notified when it is closed even if a
     // connection is not established.
-    plugin_handle.socket =
+    embedder_channel_handle.socket =
         base::FileDescriptor(channel->TakeRendererFD(), true);
-    if (plugin_handle.socket.fd == -1)
+    if (embedder_channel_handle.socket.fd == -1)
       success = false;
 #endif
     DCHECK(success);
     embedder_channels_[params.embedder_channel_name] = channel;
   }
-  DCHECK(pending_guests_.find(params.view_id) ==
-         pending_guests_.end());
-  pending_guests_[params.view_id] =
+  RenderViewImpl* render_view =
     RenderViewImpl::Create(
         params.parent_window,
         params.opener_route_id,
@@ -63,18 +62,32 @@ void BrowserPluginChannelManager::CreateRenderView(
         params.next_page_id,
         params.screen_info,
         channel,
-        params.accessibility_mode)->AsWeakPtr();
+        params.accessibility_mode);
+  ReportChannelToEmbedder(render_view,
+                          embedder_channel_handle,
+                          params.embedder_channel_name,
+                          params.embedder_container_id);
+}
+
+void BrowserPluginChannelManager::ReportChannelToEmbedder(
+    RenderViewImpl* render_view,
+    const IPC::ChannelHandle& embedder_channel_handle,
+    const std::string& embedder_channel_name,
+    int embedder_container_id) {
+  std::pair<std::string, int> pending_guests_key =
+      std::make_pair(embedder_channel_name, embedder_container_id);
+  DCHECK(pending_guests_.find(pending_guests_key) ==
+         pending_guests_.end());
+  pending_guests_[pending_guests_key] = render_view->AsWeakPtr();
   RenderThreadImpl::current()->Send(
-      new BrowserPluginHostMsg_ConnectToChannel(params.view_id,
-          success ? plugin_handle : IPC::ChannelHandle()));
+      new BrowserPluginHostMsg_ConnectToChannel(render_view->GetRoutingID(),
+          embedder_channel_handle));
 }
 
 bool BrowserPluginChannelManager::OnControlMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginChannelManager, message)
-    IPC_MESSAGE_HANDLER(BrowserPluginMsg_CompleteNavigation,
-                        OnCompleteNavigation)
     IPC_MESSAGE_HANDLER(BrowserPluginMsg_LoadGuest, OnLoadGuest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -96,18 +109,20 @@ void BrowserPluginChannelManager::RemoveChannelByName(
   embedder_channels_.erase(embedder_channel_name);
 }
 
-void BrowserPluginChannelManager::OnCompleteNavigation(
-    int guest_routing_id,
-    PP_Instance instance) {
-  CHECK(pending_guests_.find(guest_routing_id) !=
-        pending_guests_.end());
-  RenderViewImpl* render_view = pending_guests_[guest_routing_id];
-  pending_guests_.erase(guest_routing_id);
-  GuestToEmbedderChannel* channel = render_view->guest_to_embedder_channel();
+void BrowserPluginChannelManager::GuestReady(
+    PP_Instance instance,
+    const std::string& embedder_channel_name,
+    int embedder_container_id) {
+  std::pair<std::string, int> pending_guests_key =
+      make_pair(embedder_channel_name, embedder_container_id);
+  DCHECK(pending_guests_.find(pending_guests_key) !=
+         pending_guests_.end());
+  RenderViewImpl* render_view = pending_guests_[pending_guests_key];
+  pending_guests_.erase(pending_guests_key);
+  GuestToEmbedderChannel* channel = render_view->GetGuestToEmbedderChannel();
   // Associate the RenderView with the provided PP_Instance ID, request the
   // receipt of events, and initialize the graphics context.
   channel->AddGuest(instance, render_view);
-  channel->RequestInputEvents(instance);
   render_view->GuestReady(instance);
 }