BrowserPlugin: Simplify guest access

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 114 matching lines @@
   if (guest_started_drag_)
     guest_started_drag_->EndSystemDrag();
   guest_dragging_over_.reset();
   ClearGuestDragStateIfApplicable();
 }
 
 void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
   *handled = (guest_dragging_over_.get() != NULL);
 }
 
-void BrowserPluginEmbedder::OnGuestCallback(
-    int browser_plugin_instance_id,
-    const BrowserPluginHostMsg_Attach_Params& params,
-    WebContents* guest_web_contents) {
-  BrowserPluginGuest* guest = guest_web_contents ?
-      static_cast<WebContentsImpl*>(guest_web_contents)->
-          GetBrowserPluginGuest() : NULL;
-  if (guest)
-    guest->Attach(browser_plugin_instance_id, GetWebContents(), params);
-}
-
 void BrowserPluginEmbedder::OnAttach(
     int browser_plugin_instance_id,
     const BrowserPluginHostMsg_Attach_Params& params) {
-  GetBrowserPluginGuestManager()->MaybeGetGuestByInstanceIDOrKill(
-      web_contents(),
-      browser_plugin_instance_id,
-      base::Bind(&BrowserPluginEmbedder::OnGuestCallback,
-                 base::Unretained(this),
-                 browser_plugin_instance_id,
-                 params));
+  WebContents* guest_web_contents =
+      GetBrowserPluginGuestManager()->GetGuestByInstanceID(
+          GetWebContents(), browser_plugin_instance_id);
+  if (!guest_web_contents)
+    return;
+  BrowserPluginGuest* guest = static_cast<WebContentsImpl*>(guest_web_contents)
+                                  ->GetBrowserPluginGuest();
+  guest->Attach(browser_plugin_instance_id, GetWebContents(), params);
 }
 
 bool BrowserPluginEmbedder::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if ((event.windowsKeyCode != ui::VKEY_ESCAPE) ||
       (event.modifiers & blink::WebInputEvent::InputModifiers)) {
     return false;
   }
 
   bool event_consumed = false;
@@ skipping 11 matching lines @@
   *mouse_unlocked |= static_cast<WebContentsImpl*>(guest)
                          ->GetBrowserPluginGuest()
                          ->mouse_locked();
   guest->GotResponseToLockMouseRequest(false);
 
   // Returns false to iterate over all guests.
   return false;
 }
 
 }  // namespace content