BrowserPlugin: Simplify content/public API

content/public/browser/browser_plugin_guest_manager_delegate.h

Index: content/public/browser/browser_plugin_guest_manager_delegate.h
diff --git a/content/public/browser/browser_plugin_guest_manager_delegate.h b/content/public/browser/browser_plugin_guest_manager_delegate.h
index 72fdd0572b1c5bbb5858720ce9c74152ef4d8724..28a8fa60864b3c80c9430780b6ab72e231a59afe 100644
--- a/content/public/browser/browser_plugin_guest_manager_delegate.h
+++ b/content/public/browser/browser_plugin_guest_manager_delegate.h
@@ -33,24 +33,11 @@ class CONTENT_EXPORT BrowserPluginGuestManagerDelegate {
   // moves outside of content, this API will be unnecessary.
   virtual void RemoveGuest(int guest_instance_id) {}
 
-  // Returns a Webcontents given a |guest_instance_id|. Returns NULL if the
-  // guest wasn't found.  If the embedder is not permitted to access the given
-  // |guest_instance_id|, the embedder is killed, and NULL is returned.
-  virtual WebContents* GetGuestByInstanceID(int guest_instance_id,
-                                            int embedder_render_process_id);
-
-  // Returns whether the specified embedder is permitted to access the given
-  // |guest_instance_id|.
-  // TODO(fsamuel): Remove this.
-  virtual bool CanEmbedderAccessInstanceID(int embedder_render_process_id,
-                                           int guest_instance_id);
-
-  // Returns whether the specified embedder is permitted to access the given
-  // |guest_instance_id|, and kills the embedder if not.
-  // TODO(fsamuel): Remove this.
-  virtual bool CanEmbedderAccessInstanceIDMaybeKill(
+  typedef base::Callback<void(WebContents*)> GuestByInstanceIDCallback;
+  virtual void MaybeGetGuestByInstanceIDOrKill(

[lazyboy, 2014/05/01 23:27:58]

Need description here. Also note when |callback| is not expected to be called
and so on.

[Fady Samuel, 2014/05/06 16:51:36]

Done.

+      int guest_instance_id,
       int embedder_render_process_id,
-      int guest_instance_id);
+      const GuestByInstanceIDCallback& callback) {}
 
   // Returns an existing SiteInstance if the current profile has a guest of the
   // given |guest_site|.