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

content/renderer/browser_plugin/guest_to_embedder_channel.h

Index: content/renderer/browser_plugin/guest_to_embedder_channel.h
diff --git a/content/renderer/browser_plugin/guest_to_embedder_channel.h b/content/renderer/browser_plugin/guest_to_embedder_channel.h
index 7d066be334a7b64b020d837505be3680aa989fcc..1eb83ce0e64b4739cff8896450824bf5f5ef668d 100644
--- a/content/renderer/browser_plugin/guest_to_embedder_channel.h
+++ b/content/renderer/browser_plugin/guest_to_embedder_channel.h
@@ -39,7 +39,9 @@ class GuestToEmbedderChannel
     : public ppapi::proxy::Dispatcher,
       public base::RefCounted<GuestToEmbedderChannel> {
  public:
-  explicit GuestToEmbedderChannel(const std::string& embedder_channel_manager);
+  GuestToEmbedderChannel(
+      const std::string& embedder_channel_name,
+      const IPC::ChannelHandle& embedder_channel_handle);
 
   // This must be called before anything else. Returns true on success.
   bool InitChannel(const IPC::ChannelHandle& channel_handle);
@@ -70,6 +72,14 @@ class GuestToEmbedderChannel
   // InstanceMap.
   void RemoveGuest(PP_Instance instance);
 
+  const std::string& embedder_channel_name() const {
+    return embedder_channel_name_;
+  }
+
+  const IPC::ChannelHandle& embedder_channel_handle() const {
+    return embedder_channel_handle_;
+  }
+
   // ppapi::proxy::Dispatcher implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual bool Send(IPC::Message* message) OVERRIDE;
@@ -110,9 +120,11 @@ class GuestToEmbedderChannel
 
   void OnContextLost(PP_Instance instance);
 
+  void OnGuestReady(PP_Instance instance, int embedder_container_id);
+
   base::WeakPtr<RenderViewImpl> render_view_;
-  BrowserPluginChannelManager* channel_manager_;
   std::string embedder_channel_name_;
+  IPC::ChannelHandle embedder_channel_handle_;
   PepperProxyChannelDelegateImpl delegate_;
 
   InstanceMap render_view_instances_;