Cleanup CanDownload WebContentsDelegate 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 135 matching lines @@
     case NEW_WINDOW:
       return "new_window";
     case NEW_POPUP:
       return "new_popup";
     default:
       NOTREACHED() << "Unknown Window Open Disposition";
       return "ignore";
   }
 }
 
-// Called on IO thread.
-static GURL RetrieveDownloadURLFromRequestId(
-    int render_process_id,
-    int url_request_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  GlobalRequestID global_id(render_process_id, url_request_id);
-  net::URLRequest* url_request =
-      ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id);
-  if (url_request)
-    return url_request->url();

[lazyboy, 2014/05/13 01:33:51]

Note that this can be different then the original url since there can be
redirects.
I'm not sure we care though, but wanted to point out.

[Fady Samuel, 2014/05/13 14:33:12]

That's fine. I don't believe there's any change in functionality in this patch.
We avoid some extra thread hops and clean the content API. I'm CQ'ing this.

-  return GURL();
-}
-
 }  // namespace
 
 class BrowserPluginGuest::EmbedderWebContentsObserver
     : public WebContentsObserver {
  public:
   explicit EmbedderWebContentsObserver(BrowserPluginGuest* guest)
       : WebContentsObserver(guest->embedder_web_contents()),
         browser_plugin_guest_(guest) {
   }
 
@@ skipping 426 matching lines @@
                                         bool user_gesture,
                                         bool* was_blocked) {
   if (was_blocked)
     *was_blocked = false;
   RequestNewWindowPermission(disposition, initial_pos, user_gesture,
                              static_cast<WebContentsImpl*>(new_contents));
 }
 
 void BrowserPluginGuest::CanDownload(
     RenderViewHost* render_view_host,
-    int request_id,
+    const GURL& url,
     const std::string& request_method,
     const base::Callback<void(bool)>& callback) {
-  if (!delegate_) {
+  if (!delegate_ || !url.is_valid()) {
     callback.Run(false);
     return;
   }
 
-  BrowserThread::PostTaskAndReplyWithResult(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&RetrieveDownloadURLFromRequestId,
-                 render_view_host->GetProcess()->GetID(), request_id),
-      base::Bind(&BrowserPluginGuest::DidRetrieveDownloadURLFromRequestId,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 request_method,
-                 callback));
+  delegate_->CanDownload(request_method, url, callback);
 }
 
 void BrowserPluginGuest::LoadProgressChanged(WebContents* contents,
                                              double progress) {
   if (delegate_)
     delegate_->LoadProgressed(progress);
 }
 
 void BrowserPluginGuest::CloseContents(WebContents* source) {
   if (!delegate_)
@@ skipping 907 matching lines @@
 #if defined(OS_MACOSX) || defined(USE_AURA)
 void BrowserPluginGuest::OnImeCompositionRangeChanged(
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds) {
   static_cast<RenderWidgetHostViewBase*>(
       web_contents()->GetRenderWidgetHostView())->ImeCompositionRangeChanged(
           range, character_bounds);
 }
 #endif
 
-void BrowserPluginGuest::DidRetrieveDownloadURLFromRequestId(
-    const std::string& request_method,
-    const base::Callback<void(bool)>& callback,
-    const GURL& url) {
-  if (!url.is_valid()) {
-    callback.Run(false);
-    return;
-  }
-
-  delegate_->CanDownload(request_method, url, callback);
-}
-
 }  // namespace content