BrowserPlugin: Simplify content/public API

content/public/browser/browser_plugin_guest_manager_delegate.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_MANAGER_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_MANAGER_DELEGATE_H_
 
 #include "base/callback.h"
 #include "content/common/content_export.h"
 
@@ skipping 19 matching lines @@
   // TODO(fsamuel): Remove this. Once guest WebContents allocation
   // moves outside of content, this API will be unnecessary.
   virtual void AddGuest(int guest_instance_id,
                         WebContents* guest_web_contents) {}
 
   // Removes a |guest_instance_id| as a valid guest.
   // TODO(fsamuel): Remove this. Once guest WebContents allocation
   // 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;
+  // Requests a guest WebContents associated with the provided
+  // |guest_instance_id|. If a guest associated with the provided ID
+  // does not exist, then the |callback| will be called with a NULL
+  // WebContents. If the provided |embedder_render_process_id| does
+  // not own the requested guest, then the embedder will be killed,
+  // and the |callback| will not be called.

[jam, 2014/05/06 18:21:49]

regarding this last sentance; if content is requiring embedders to do this logic
(kill if the given process isn't the owner), why not do this in content? it
seems simpler from an api pov, and also in not requiring all embedders to do
something that content could itself do.

+  virtual void MaybeGetGuestByInstanceIDOrKill(
+      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|.
   // TODO(fsamuel): Remove this. Once guest WebContents allocation
   // moves outside of content, this API will be unnecessary.
   virtual content::SiteInstance* GetGuestSiteInstance(const GURL& guest_site);
 
   // Iterates over all WebContents belonging to a given |embedder_web_contents|,
   // calling |callback| for each. If one of the callbacks returns true, then
   // the iteration exits early.
   typedef base::Callback<bool(WebContents*)> GuestCallback;
   virtual bool ForEachGuest(WebContents* embedder_web_contents,
                             const GuestCallback& callback);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_MANAGER_DELEGATE_H_