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

content/renderer/browser_plugin/browser_plugin_channel_manager.h

 // 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.
 
 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CHANNEL_MANAGER_H_
 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CHANNEL_MANAGER_H_
 #pragma once
 
 #include <set>
 
@@ skipping 16 matching lines @@
 // PluginInstance once a channel has been established.
 class BrowserPluginChannelManager
     : public RenderProcessObserver {
  public:
   BrowserPluginChannelManager();
 
   virtual ~BrowserPluginChannelManager();
 
   void CreateRenderView(const ViewMsg_New_Params& params);
 
+  void ReportChannelToEmbedder(
+      RenderViewImpl* render_view,
+      const IPC::ChannelHandle& embedder_channel_handle,
+      const std::string& embedder_channel_name,
+      int embedder_container_id);
+
   // Get the GuestToEmbedderChannel associated with the given
   // embedder_channel_name.
   GuestToEmbedderChannel* GetChannelByName(
       const std::string& embedder_channel_name);
 
   // Remove the pointer to the GuestToEmbedderChannel associated with the given
   // routing_id.
   void RemoveChannelByName(const std::string& embedder_channel_name);
 
+  void GuestReady(PP_Instance instance,
+                  const std::string& embedder_channel_name,
+                  int embedder_container_id);
+
  private:
   typedef std::map<std::string, scoped_refptr<GuestToEmbedderChannel> >
       EmbedderChannelNameToChannelMap;
 
-  void OnCompleteNavigation(int guest_routing_id,
-                            PP_Instance instance);
-
   void OnLoadGuest(int instance_id,
                    int guest_renderer_id,
                    const IPC::ChannelHandle& channel_handle);
 
   // RenderProcessObserver override. Call on render thread.
   virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Map from Host process ID to GuestToEmbedderChannel
   EmbedderChannelNameToChannelMap embedder_channels_;
 
-  // Map from Routing ID to RenderViewImpl that points to RenderViewImpl
-  // guests that have been constructed but don't have a PP_Instance and
-  // so they aren't yet ready to composite.
-  std::map<int, base::WeakPtr<RenderViewImpl> > pending_guests_;
+  // Map from <embedder_channel_name, embedder_container_id> to RenderViewImpl
+  // that points to RenderViewImpl guests that have been constructed but don't
+  // have a PP_Instance and so they aren't yet ready to composite.
+  std::map<std::pair<std::string, int>,
+           base::WeakPtr<RenderViewImpl> > pending_guests_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginChannelManager);
 };
 
 }  // namespace content
 
 #endif //  CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_CHANNEL_MANAGER_H_