Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/browser_plugin_manager_impl.h

Index: content/renderer/browser_plugin/browser_plugin_manager_impl.h
diff --git a/content/renderer/browser_plugin/browser_plugin_manager_impl.h b/content/renderer/browser_plugin/browser_plugin_manager_impl.h
index 37f632406bb42286180ececdc65b4a1ad48713e1..b20e72d2e050885ad26fe249f17b9f550206c9f0 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager_impl.h
+++ b/content/renderer/browser_plugin/browser_plugin_manager_impl.h
@@ -27,6 +27,7 @@ class BrowserPluginManagerImpl : public BrowserPluginManager {
       RenderViewImpl* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params) OVERRIDE;
+  virtual void AllocateInstanceID(BrowserPlugin* browser_plugin) OVERRIDE;
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* msg) OVERRIDE;
@@ -36,6 +37,9 @@ class BrowserPluginManagerImpl : public BrowserPluginManager {
  private:
   virtual ~BrowserPluginManagerImpl();
 
+  void OnAllocateInstanceIDACK(const IPC::Message& message,
+                               int request_id,
+                               int instance_id);
   void OnPluginAtPositionRequest(const IPC::Message& message,
                                  int request_id,
                                  const gfx::Point& position);
@@ -49,6 +53,9 @@ class BrowserPluginManagerImpl : public BrowserPluginManager {
   // Returns whether a message should be forwarded to BrowserPlugins.
   static bool ShouldForwardToBrowserPlugin(const IPC::Message& message);
 
+  int request_id_counter_;
+  IDMap<BrowserPlugin> pending_allocate_instance_id_requests_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginManagerImpl);
 };