1 files changed, 10 insertions, 13 deletions
diff --git a/chromium/content/renderer/browser_plugin/mock_browser_plugin_manager.cc b/chromium/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
index 4a606862ef1..36d78b8675b 100644
--- a/chromium/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
+++ b/chromium/content/renderer/browser_plugin/mock_browser_plugin_manager.cc
@@ -14,34 +14,31 @@ namespace content {
 MockBrowserPluginManager::MockBrowserPluginManager(
     RenderViewImpl* render_view)
     : BrowserPluginManager(render_view),
-      guest_instance_id_counter_(0) {
+      guest_instance_id_counter_(0),
+      last_plugin_(NULL) {
 }
 
 MockBrowserPluginManager::~MockBrowserPluginManager() {
 }
 
 BrowserPlugin* MockBrowserPluginManager::CreateBrowserPlugin(
-    RenderViewImpl* render_view, blink::WebFrame* frame) {
-  return new MockBrowserPlugin(render_view, frame);
+    RenderViewImpl* render_view,
+    blink::WebFrame* frame,
+    bool auto_navigate) {
+  last_plugin_ = new MockBrowserPlugin(render_view, frame, auto_navigate);
+  return last_plugin_;
 }
 
 void MockBrowserPluginManager::AllocateInstanceID(
-    const base::WeakPtr<BrowserPlugin>& browser_plugin) {
-  int guest_instance_id = ++guest_instance_id_counter_;
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&MockBrowserPluginManager::AllocateInstanceIDACK,
-                 this,
-                 browser_plugin.get(),
-                 guest_instance_id));
+    BrowserPlugin* browser_plugin) {
+  AllocateInstanceIDACK(browser_plugin, ++guest_instance_id_counter_);
 }
 
 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) {