Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/mock_browser_plugin_manager.cc

Index: content/renderer/browser_plugin/mock_browser_plugin_manager.cc
diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
index da8541fa0c5ec4f6fd4c3f48f0909bd3f8075b7b..fdea06b056fdad7edb7f4a3a1d36c59f92c4159e 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
+++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
@@ -4,14 +4,17 @@
 
 #include "content/renderer/browser_plugin/mock_browser_plugin_manager.h"
 
-#include "ipc/ipc_message.h"
+#include "base/message_loop.h"
+#include "content/common/browser_plugin_messages.h"
 #include "content/renderer/browser_plugin/mock_browser_plugin.h"
+#include "ipc/ipc_message.h"
 
 namespace content {
 
 MockBrowserPluginManager::MockBrowserPluginManager(
     RenderViewImpl* render_view)
-    : BrowserPluginManager(render_view) {
+    : BrowserPluginManager(render_view),
+      browser_plugin_counter_(0) {
 }
 
 MockBrowserPluginManager::~MockBrowserPluginManager() {
@@ -21,10 +24,24 @@ BrowserPlugin* MockBrowserPluginManager::CreateBrowserPlugin(
     RenderViewImpl* render_view,
     WebKit::WebFrame* frame,
     const WebKit::WebPluginParams& params) {
-  return new MockBrowserPlugin(++browser_plugin_counter_,
-                               render_view,
-                               frame,
-                               params);
+  return new MockBrowserPlugin(render_view, frame, params);
+}
+
+void MockBrowserPluginManager::AllocateInstanceID(
+    BrowserPlugin* browser_plugin) {
+  int instance_id = ++browser_plugin_counter_;
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&MockBrowserPluginManager::AllocateInstanceIDACK,
+                 this,
+                 base::Unretained(browser_plugin),
+                 instance_id));
+}
+
+void MockBrowserPluginManager::AllocateInstanceIDACK(
+    BrowserPlugin* browser_plugin,
+    int instance_id) {
+  browser_plugin->SetInstanceID(instance_id);
 }
 
 bool MockBrowserPluginManager::Send(IPC::Message* msg) {