Remove BrowserPlugin's -internal-attach method

content/renderer/browser_plugin/browser_plugin_manager_impl.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/browser_plugin_manager_impl.h"
 
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/renderer/browser_plugin/browser_plugin.h"
@@ skipping 15 matching lines @@
     bool auto_navigate) {
   return new BrowserPlugin(render_view, frame, auto_navigate);
 }
 
 bool BrowserPluginManagerImpl::Send(IPC::Message* msg) {
   return RenderThread::Get()->Send(msg);
 }
 
 bool BrowserPluginManagerImpl::OnMessageReceived(
     const IPC::Message& message) {
+  if (message.type() == BrowserPluginMsg_Attach_ACK::ID) {
+    // BrowserPluginMsg_Attach_ACK has BPID as param.
+    // Until this ACK is received, BrowserPlugin doesn't know about
+    // its guest instance ID, and so the BPID is used for routing.
+    int browser_plugin_instance_id = browser_plugin::kInstanceIDNone;
+    PickleIterator iter(message);
+    bool success = iter.ReadInt(&browser_plugin_instance_id);
+    DCHECK(success);
+    BrowserPlugin* plugin =
+        GetBrowserPluginInternal(browser_plugin_instance_id);
+    if (plugin && plugin->OnMessageReceived(message)) {
+      return true;
+    }
+    return false;
+  }
+
   if (BrowserPlugin::ShouldForwardToBrowserPlugin(message)) {
     int guest_instance_id = browser_plugin::kInstanceIDNone;
     // All allowed messages must have |guest_instance_id| as their first
     // parameter.
     PickleIterator iter(message);
     bool success = iter.ReadInt(&guest_instance_id);
     DCHECK(success);
     BrowserPlugin* plugin = GetBrowserPlugin(guest_instance_id);
     if (plugin && plugin->OnMessageReceived(message))
       return true;
   }
 
   return false;
 }
 
 void BrowserPluginManagerImpl::DidCommitCompositorFrame() {
   IDMap<BrowserPlugin>::iterator iter(&instances_);
   while (!iter.IsAtEnd()) {
     iter.GetCurrentValue()->DidCommitCompositorFrame();
     iter.Advance();
   }
 }
 
 }  // namespace content