Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/mock_browser_plugin_manager.h

Index: content/renderer/browser_plugin/mock_browser_plugin_manager.h
diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.h b/content/renderer/browser_plugin/mock_browser_plugin_manager.h
index 5d7c17518033dafceb70e758e2700123e5b4e546..c84ce0c414b2de13de7557139df97d43d832127e 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.h
@@ -22,6 +22,7 @@ class MockBrowserPluginManager : public BrowserPluginManager {
       RenderViewImpl* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params) OVERRIDE;
+  virtual void AllocateInstanceID(BrowserPlugin* browser_plugin) OVERRIDE;
 
   // Provides access to the messages that have been received by this thread.
   IPC::TestSink& sink() { return sink_; }
@@ -31,11 +32,16 @@ class MockBrowserPluginManager : public BrowserPluginManager {
   virtual bool Send(IPC::Message* msg) OVERRIDE;
  protected:
   virtual ~MockBrowserPluginManager();
+  void AllocateInstanceIDACK(BrowserPlugin* browser_plugin,
+                             int instance_id);
+
   IPC::TestSink sink_;
 
   // The last known good deserializer for sync messages.
   scoped_ptr<IPC::MessageReplyDeserializer> reply_deserializer_;
 
+  int browser_plugin_counter_;
+
   DISALLOW_COPY_AND_ASSIGN(MockBrowserPluginManager);
 };