BrowserPlugin: Simplify guest access

content/browser/browser_plugin/browser_plugin_message_filter.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_message_filter.h"
 
 #include "base/supports_user_data.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 41 matching lines @@
 void BrowserPluginMessageFilter::OnDestruct() const {
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
 void BrowserPluginMessageFilter::OverrideThreadForMessage(
     const IPC::Message& message, BrowserThread::ID* thread) {
   if (BrowserPluginGuest::ShouldForwardToBrowserPluginGuest(message))
     *thread = BrowserThread::UI;
 }
 
-static void BrowserPluginGuestMessageCallback(const IPC::Message& message,
-                                              WebContents* guest_web_contents) {
-  if (!guest_web_contents)
-    return;
-  static_cast<WebContentsImpl*>(guest_web_contents)->GetBrowserPluginGuest()->
-      OnMessageReceivedFromEmbedder(message);
-}
-
 void BrowserPluginMessageFilter::ForwardMessageToGuest(
     const IPC::Message& message) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RenderViewHost* rvh = RenderViewHost::FromID(render_process_id_,
                                                message.routing_id());
   if (!rvh)
     return;
 
   WebContents* embedder_web_contents = WebContents::FromRenderViewHost(rvh);
 
   int browser_plugin_instance_id = 0;
   // All allowed messages must have instance_id as their first parameter.
   PickleIterator iter(message);
   bool success = iter.ReadInt(&browser_plugin_instance_id);
   DCHECK(success);
-  embedder_web_contents->GetBrowserContext()->GetGuestManager()->
-      MaybeGetGuestByInstanceIDOrKill(
-          embedder_web_contents,
-          browser_plugin_instance_id,
-          base::Bind(&BrowserPluginGuestMessageCallback,
-                     message));
+  WebContents* guest_web_contents =
+      embedder_web_contents->GetBrowserContext()
+          ->GetGuestManager()
+          ->GetGuestByInstanceID(embedder_web_contents,
+                                 browser_plugin_instance_id);
+  if (!guest_web_contents)
+    return;
+
+  static_cast<WebContentsImpl*>(guest_web_contents)
+      ->GetBrowserPluginGuest()
+      ->OnMessageReceivedFromEmbedder(message);
 }
 
 void BrowserPluginMessageFilter::OnSwapBuffersACK(
     const FrameHostMsg_BuffersSwappedACK_Params& params) {
   GpuProcessHost* gpu_host = GpuProcessHost::FromID(params.gpu_host_id);
   if (!gpu_host)
     return;
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox = params.mailbox;
   ack_params.sync_point = params.sync_point;
   gpu_host->Send(new AcceleratedSurfaceMsg_BufferPresented(params.gpu_route_id,
                                                            ack_params));
 }
 
 } // namespace content