BrowserPlugin: Simplify content/public API

content/browser/browser_plugin/browser_plugin_guest.cc

 // Copyright (c) 2012 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 "content/browser/browser_plugin/browser_plugin_guest.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 80 matching lines @@
       : PermissionRequest(guest),
         instance_id_(instance_id) {
     RecordAction(
         base::UserMetricsAction("BrowserPlugin.Guest.PermissionRequest.NewWindow"));
   }
 
   virtual void RespondImpl(bool should_allow,
                            const std::string& user_input) OVERRIDE {
     int embedder_render_process_id =
         guest_->embedder_web_contents()->GetRenderProcessHost()->GetID();
-    BrowserPluginGuest* guest = guest_->GetBrowserPluginGuestManager()->
-        GetGuestByInstanceID(instance_id_, embedder_render_process_id);
+    guest_->GetBrowserPluginGuestManager()->
+        MaybeGetGuestByInstanceIDOrKill(
+            instance_id_,
+            embedder_render_process_id,
+            base::Bind(&BrowserPluginGuest::NewWindowRequest::RespondInternal,
+                       base::Unretained(this),
+                       should_allow));
+  }
+
+ private:
+  virtual ~NewWindowRequest() {}
+
+  void RespondInternal(bool should_allow,
+                       BrowserPluginGuest* guest) {
     if (!guest) {
       VLOG(0) << "Guest not found. Instance ID: " << instance_id_;
       return;
     }
 
     // If we do not destroy the guest then we allow the new window.
     if (!should_allow)
       guest->Destroy();
   }
 
- private:
-  virtual ~NewWindowRequest() {}
   int instance_id_;
 };
 
 namespace {
 std::string WindowOpenDispositionToString(
   WindowOpenDisposition window_open_disposition) {
   switch (window_open_disposition) {
     case IGNORE_ACTION:
       return "ignore";
     case SAVE_TO_DISK:
@@ skipping 1422 matching lines @@
     const GURL& url) {
   if (!url.is_valid()) {
     callback.Run(false);
     return;
   }
 
   delegate_->CanDownload(request_method, url, callback);
 }
 
 }  // namespace content