Remove BrowserPlugin's -internal-attach method

content/browser/browser_plugin/browser_plugin_embedder.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/browser/browser_plugin/browser_plugin_embedder.h"
 
 #include "base/values.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 98 matching lines @@
     guest_started_drag_->EndSystemDrag();
   guest_started_drag_.reset();
   guest_dragging_over_.reset();
 }
 
 void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
   *handled = (guest_dragging_over_.get() != NULL);
 }
 
 void BrowserPluginEmbedder::OnGuestCallback(
-    int instance_id,
+    int browser_plugin_instance_id,
     const BrowserPluginHostMsg_Attach_Params& params,
-    const base::DictionaryValue* extra_params,
     WebContents* guest_web_contents) {
   BrowserPluginGuest* guest = guest_web_contents ?
       static_cast<WebContentsImpl*>(guest_web_contents)->
           GetBrowserPluginGuest() : NULL;
   if (guest)
-    guest->Attach(GetWebContents(), params, *extra_params);
+    guest->Attach(browser_plugin_instance_id, GetWebContents(), params);
 }
 
 void BrowserPluginEmbedder::OnAttach(
-    int instance_id,
-    const BrowserPluginHostMsg_Attach_Params& params,
-    const base::DictionaryValue& extra_params) {
+    int browser_plugin_instance_id,
+    const BrowserPluginHostMsg_Attach_Params& params) {
   GetBrowserPluginGuestManager()->MaybeGetGuestByInstanceIDOrKill(
-      instance_id, GetWebContents()->GetRenderProcessHost()->GetID(),
+      web_contents(),
+      browser_plugin_instance_id,
       base::Bind(&BrowserPluginEmbedder::OnGuestCallback,
                  base::Unretained(this),
-                 instance_id,
-                 params,
-                 &extra_params));
+                 browser_plugin_instance_id,
+                 params));
 }
 
 bool BrowserPluginEmbedder::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if (event.windowsKeyCode != ui::VKEY_ESCAPE)
     return false;
 
   bool event_consumed = false;
   GetBrowserPluginGuestManager()->ForEachGuest(
       GetWebContents(),
       base::Bind(&BrowserPluginEmbedder::UnlockMouseIfNecessaryCallback,
                  base::Unretained(this),
                  &event_consumed));
 
   return event_consumed;
 }
 
 bool BrowserPluginEmbedder::UnlockMouseIfNecessaryCallback(bool* mouse_unlocked,
                                                            WebContents* guest) {
   *mouse_unlocked |= static_cast<WebContentsImpl*>(guest)
                          ->GetBrowserPluginGuest()
                          ->mouse_locked();
   guest->GotResponseToLockMouseRequest(false);
 
   // Returns false to iterate over all guests.
   return false;
 }
 
 }  // namespace content