Use ResourceRequestInfo::GetWebContents in DownloadRequestLimiter

content/browser/android/download_controller_android_impl.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/android/download_controller_android_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 163 matching lines @@
   for (auto iter = deferred_downloads_.begin();
       iter != deferred_downloads_.end(); ++iter) {
     if (*iter == observer) {
       deferred_downloads_.erase(iter);
       return;
     }
   }
 }
 
 void DownloadControllerAndroidImpl::AcquireFileAccessPermission(
-    int render_process_id,
-    int render_view_id,
+    WebContents* web_contents,
     const DownloadControllerAndroid::AcquireFileAccessPermissionCallback& cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  WebContents* web_contents = GetWebContents(render_process_id, render_view_id);
   if (!web_contents) {

[davidben, 2015/11/24 15:51:16]

Nit: I'd probably have moved this into the caller. (Thinking about this class on
its own, it's a little weird to ask the DownloadControllerAndroidImpl "hey, I'd
like to acquire file access permission on <does not exist>".)

[clamy, 2015/11/25 14:02:02]

Done. Note that the caller now run the callback synchronously in that case.

     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, base::Bind(cb, false));
     return;
   }
 
   ScopedJavaLocalRef<jobject> view =
       GetContentViewCoreFromWebContents(web_contents);
   if (view.is_null()) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, base::Bind(cb, false));
@@ skipping 147 matching lines @@
     // ContentViewCore is created.
     deferred_downloads_.push_back(new DeferredDownloadObserver(
         web_contents,
         base::Bind(&DownloadControllerAndroidImpl::StartAndroidDownload,
                    base::Unretained(this), render_process_id, render_view_id,
                    info)));
     return;
   }
 
   AcquireFileAccessPermission(
-      render_process_id, render_view_id,
+      web_contents,
       base::Bind(&DownloadControllerAndroidImpl::StartAndroidDownloadInternal,
                  base::Unretained(this), render_process_id, render_view_id,
                  info));
 }
 
 void DownloadControllerAndroidImpl::StartAndroidDownloadInternal(
     int render_process_id, int render_view_id,
     const DownloadInfoAndroid& info, bool allowed) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!allowed)
@@ skipping 155 matching lines @@
   DCHECK(java_object_);
   return java_object_;
 }
 
 void DownloadControllerAndroidImpl::StartContextMenuDownload(
     const ContextMenuParams& params, WebContents* web_contents, bool is_link,
     const std::string& extra_headers) {
   int process_id = web_contents->GetRenderProcessHost()->GetID();
   int routing_id = web_contents->GetRoutingID();
   AcquireFileAccessPermission(
-      process_id, routing_id,
-      base::Bind(&CreateContextMenuDownload, process_id, routing_id, params,
-                 is_link, extra_headers));
+      web_contents, base::Bind(&CreateContextMenuDownload, process_id,
+                               routing_id, params, is_link, extra_headers));
 }
 
 void DownloadControllerAndroidImpl::DangerousDownloadValidated(
     WebContents* web_contents, int download_id, bool accept) {
   if (!web_contents)
     return;
   DownloadManagerImpl* dlm = static_cast<DownloadManagerImpl*>(
       BrowserContext::GetDownloadManager(web_contents->GetBrowserContext()));
   DownloadItem* item = dlm->GetDownload(download_id);
   if (!item)
@@ skipping 25 matching lines @@
   }
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   if (info)
     has_user_gesture = info->HasUserGesture();
 }
 
 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {}
 
 }  // namespace content