Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/mock_browser_plugin_manager.cc

 // 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.
 
 #include "content/renderer/browser_plugin/mock_browser_plugin_manager.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"
-#include "content/renderer/browser_plugin/mock_browser_plugin.h"
 
 namespace content {
 
 MockBrowserPluginManager::MockBrowserPluginManager(
     RenderViewImpl* render_view)
-    : BrowserPluginManager(render_view) {
+    : BrowserPluginManager(render_view),
+      browser_plugin_counter_(0) {
 }
 
 MockBrowserPluginManager::~MockBrowserPluginManager() {
 }
 
 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::AllocateInstanceIDResponse,
+                 this,
+                 base::Unretained(browser_plugin),
+                 instance_id));
+}
+
+void MockBrowserPluginManager::AllocateInstanceIDResponse(
+    BrowserPlugin* browser_plugin,
+    int instance_id) {
+  BrowserPluginMsg_AllocateInstanceIDResponse instance_msg(
+      browser_plugin->render_view_routing_id(), 0, instance_id);
+  browser_plugin->OnMessageReceived(instance_msg);
 }
 
 bool MockBrowserPluginManager::Send(IPC::Message* msg) {
   // This is a copy-and-paste from MockRenderThread::Send.
   // We need to simulate a synchronous channel, thus we are going to receive
   // through this function messages, messages with reply and reply messages.
   // We can only handle one synchronous message at a time.
   if (msg->is_reply()) {
     if (reply_deserializer_.get()) {
       reply_deserializer_->SerializeOutputParameters(*msg);
@@ skipping 13 matching lines @@
 }
 
 bool MockBrowserPluginManager::OnMessageReceived(
     const IPC::Message& message) {
   // Save the message in the sink.
   sink_.OnMessageReceived(message);
   return false;
 }
 
 }  // namespace content