BrowserPlugin: Simplify guest access

extensions/browser/guest_view/guest_view_manager.cc

 // Copyright 2014 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 "extensions/browser/guest_view/guest_view_manager.h"
 
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 130 matching lines @@
   content::WebContents::CreateParams guest_create_params(create_params);
   guest_create_params.guest_delegate = guest;
   content::WebContents* guest_web_contents =
       WebContents::Create(guest_create_params);
   guest->InitWithWebContents(embedder_extension_id,
                              embedder_render_process_id,
                              guest_web_contents);
   return guest_web_contents;
 }
 
-void GuestViewManager::MaybeGetGuestByInstanceIDOrKill(
+content::WebContents* GuestViewManager::GetGuestByInstanceID(
     content::WebContents* embedder_web_contents,
-    int element_instance_id,
-    const GuestByInstanceIDCallback& callback) {
-  int guest_instance_id = GetGuestInstanceIDForPluginID(embedder_web_contents,
-                                                        element_instance_id);
+    int element_instance_id) {
+  int guest_instance_id = GetGuestInstanceIDForElementID(embedder_web_contents,
+                                                         element_instance_id);
   if (guest_instance_id == guestview::kInstanceIDNone)
-    return;
-  int embedder_render_process_id =
-      embedder_web_contents->GetRenderProcessHost()->GetID();
-  if (!CanEmbedderAccessInstanceIDMaybeKill(embedder_render_process_id,
-                                            guest_instance_id)) {
-    // If we kill the embedder, then don't bother calling back.
-    return;
-  }
-  content::WebContents* guest_web_contents =
-      GetGuestByInstanceID(guest_instance_id);
-  callback.Run(guest_web_contents);
+    return NULL;
+
+  return GetGuestByInstanceID(guest_instance_id);
 }
 
-int GuestViewManager::GetGuestInstanceIDForPluginID(
+int GuestViewManager::GetGuestInstanceIDForElementID(
     content::WebContents* embedder_web_contents,
     int element_instance_id) {
   GuestInstanceIDMap::iterator iter = instance_id_map_.find(
       ElementInstanceKey(embedder_web_contents, element_instance_id));
   if (iter == instance_id_map_.end())
     return guestview::kInstanceIDNone;
   return iter->second;
 }
 
 SiteInstance* GuestViewManager::GetGuestSiteInstance(
@@ skipping 123 matching lines @@
     return true;
 
   GuestViewBase* guest_view = GuestViewBase::FromWebContents(it->second);
   if (!guest_view)
     return false;
 
   return embedder_render_process_id == guest_view->embedder_render_process_id();
 }
 
 }  // namespace extensions