BrowserPlugin: Simplify content/public API

content/shell/browser/browser_plugin/test_guest_manager_delegate.cc

Index: content/shell/browser/browser_plugin/test_guest_manager_delegate.cc
diff --git a/content/shell/browser/browser_plugin/test_guest_manager_delegate.cc b/content/shell/browser/browser_plugin/test_guest_manager_delegate.cc
index c178cbd471559f095af626129fffd5f13f7b259d..c73d28659d058a1adb3457ad5bb416833a50490b 100644
--- a/content/shell/browser/browser_plugin/test_guest_manager_delegate.cc
+++ b/content/shell/browser/browser_plugin/test_guest_manager_delegate.cc
@@ -43,26 +43,17 @@ void TestGuestManagerDelegate::RemoveGuest(
   guest_web_contents_by_instance_id_.erase(it);
 }
 
-WebContents* TestGuestManagerDelegate::GetGuestByInstanceID(
-  int guest_instance_id,
-  int embedder_render_process_id) {
+void TestGuestManagerDelegate::MaybeGetGuestByInstanceIDOrKill(
+    int guest_instance_id,
+    int embedder_render_process_id,
+    const GuestByInstanceIDCallback& callback) {
   GuestInstanceMap::const_iterator it =
       guest_web_contents_by_instance_id_.find(guest_instance_id);
-  if (it == guest_web_contents_by_instance_id_.end())
-    return NULL;
-  return it->second;
-}
-
-bool TestGuestManagerDelegate::CanEmbedderAccessInstanceIDMaybeKill(
-  int embedder_render_process_id,
-  int guest_instance_id) {
-  return true;
-}
-
-bool TestGuestManagerDelegate::CanEmbedderAccessInstanceID(
-    int embedder_render_process_id,
-    int guest_instance_id) {
-  return true;
+  if (it == guest_web_contents_by_instance_id_.end()) {
+    callback.Run(NULL);
+    return;
+  }
+  callback.Run(it->second);
 }
 
 SiteInstance* TestGuestManagerDelegate::GetGuestSiteInstance(