Browser Plugin: Simplified guest attachment

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/message_loop.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/renderer/browser_plugin/mock_browser_plugin.h"
 #include "ipc/ipc_message.h"
@@ skipping 23 matching lines @@
       FROM_HERE,
       base::Bind(&MockBrowserPluginManager::AllocateInstanceIDACK,
                  this,
                  browser_plugin.get(),
                  guest_instance_id));
 }
 
 void MockBrowserPluginManager::AllocateInstanceIDACK(
     BrowserPlugin* browser_plugin,
     int guest_instance_id) {
-  browser_plugin->OnInstanceIDAllocated(guest_instance_id);
   scoped_ptr<base::DictionaryValue> extra_params(new base::DictionaryValue());
-  browser_plugin->Attach(extra_params.Pass());
+  browser_plugin->Attach(guest_instance_id, extra_params.Pass());
 }
 
 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_) {
       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