Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/browser_plugin_manager.h

Index: content/renderer/browser_plugin/browser_plugin_manager.h
diff --git a/content/renderer/browser_plugin/browser_plugin_manager.h b/content/renderer/browser_plugin/browser_plugin_manager.h
index 21f17fa1033771a4e5f2cf1775bf354bdd277a19..a4a59daf32058002b2c3b5c30c04b96fa4ab7f00 100644
--- a/content/renderer/browser_plugin/browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/browser_plugin_manager.h
@@ -38,7 +38,7 @@ class CONTENT_EXPORT BrowserPluginManager
     BrowserPluginManager::factory_ = factory;
   }
 
-  BrowserPluginManager(RenderViewImpl* render_view);
+  explicit BrowserPluginManager(RenderViewImpl* render_view);
 
   // Creates a new BrowserPlugin object with a unique identifier.
   // BrowserPlugin is responsible for associating itself with the
@@ -48,6 +48,7 @@ class CONTENT_EXPORT BrowserPluginManager
       RenderViewImpl* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params) = 0;
+  virtual void AllocateInstanceID(BrowserPlugin* browser_plugin) = 0;
 
   void AddBrowserPlugin(int instance_id, BrowserPlugin* browser_plugin);
   void RemoveBrowserPlugin(int instance_id);
@@ -76,7 +77,8 @@ class CONTENT_EXPORT BrowserPluginManager
   virtual ~BrowserPluginManager();
   IDMap<BrowserPlugin> instances_;
   base::WeakPtr<RenderViewImpl> render_view_;
-  int browser_plugin_counter_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserPluginManager);
 };
 
 }  // namespace content