BrowserPlugin: Simplify content/public API

chrome/browser/guest_view/guest_view_manager.h

Index: chrome/browser/guest_view/guest_view_manager.h
diff --git a/chrome/browser/guest_view/guest_view_manager.h b/chrome/browser/guest_view/guest_view_manager.h
index 0c7382795ef373cad9ac0f24d4c37586d4308759..b26ae9c89e78b60b2ab16e5fad606daf5c13e969 100644
--- a/chrome/browser/guest_view/guest_view_manager.h
+++ b/chrome/browser/guest_view/guest_view_manager.h
@@ -29,19 +29,24 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate,
 
   static GuestViewManager* FromBrowserContext(content::BrowserContext* context);
 
+  // Returns the guest WebContents associated with the given |guest_instance_id|
+  // if the provided |embedder_render_process_id| is allowed to access it.
+  // If the embedder is not allowed access, the embedder will be killed, and
+  // this method will return NULL. If no WebContents exists with the given
+  // instance ID, then NULL will also be returned.
+  content::WebContents* GetGuestByInstanceIDSafely(
+      int guest_instance_id,
+      int embedder_render_process_id);
+
   // BrowserPluginGuestManagerDelegate implementation.
   virtual int GetNextInstanceID() OVERRIDE;
   virtual void AddGuest(int guest_instance_id,
                         content::WebContents* guest_web_contents) OVERRIDE;
   virtual void RemoveGuest(int guest_instance_id) OVERRIDE;
-  virtual content::WebContents* GetGuestByInstanceID(
+  virtual void MaybeGetGuestByInstanceIDOrKill(
       int guest_instance_id,
-      int embedder_render_process_id) OVERRIDE;
-  virtual bool CanEmbedderAccessInstanceIDMaybeKill(
       int embedder_render_process_id,
-      int guest_instance_id) OVERRIDE;
-  virtual bool CanEmbedderAccessInstanceID(int embedder_render_process_id,
-                                           int guest_instance_id) OVERRIDE;
+      const GuestByInstanceIDCallback& callback) OVERRIDE;
   virtual content::SiteInstance* GetGuestSiteInstance(
       const GURL& guest_site) OVERRIDE;
   virtual bool ForEachGuest(content::WebContents* embedder_web_contents,
@@ -52,6 +57,17 @@ class GuestViewManager : public content::BrowserPluginGuestManagerDelegate,
 
   void AddRenderProcessHostID(int render_process_host_id);
 
+  content::WebContents* GetGuestByInstanceID(
+      int guest_instance_id,
+      int embedder_render_process_id);
+
+  bool CanEmbedderAccessInstanceIDMaybeKill(
+      int embedder_render_process_id,
+      int guest_instance_id);
+
+  bool CanEmbedderAccessInstanceID(int embedder_render_process_id,
+                                   int guest_instance_id);
+
   static bool CanEmbedderAccessGuest(int embedder_render_process_id,
                                      GuestViewBase* guest);