Use ResourceRequestInfo::GetWebContents in DownloadRequestLimiter

chrome/browser/download/download_request_limiter.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_LIMITER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_LIMITER_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class HostContentSettingsMap;
 class DownloadRequestInfoBarDelegateAndroid;
 
 namespace content {
 class NavigationController;
 class WebContents;
 }
 
@@ skipping 146 matching lines @@
 
   static void SetContentSettingsForTesting(HostContentSettingsMap* settings);
 
   DownloadRequestLimiter();
 
   // Returns the download status for a page. This does not change the state in
   // anyway.
   DownloadStatus GetDownloadStatus(content::WebContents* tab);
 
   // Check if download can proceed and notifies the callback on UI thread.
-  void CanDownload(int render_process_host_id,
-                   int render_view_id,
+  void CanDownload(const content::ResourceRequestInfo::WebContentsGetter&
+                       web_contents_getter,

[davidben, 2015/12/01 22:15:15]

[Hrmf. I was going to suggest this ought to be a WebContents*, but it seems
CanDownload's behavior if the WebContents is destroyed first is far from clear.
Oh well. I can sort that out afterwards I guess.]

[clamy, 2015/12/02 09:34:00]

Acknowledged.

                    const GURL& url,
                    const std::string& request_method,
                    const Callback& callback);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DownloadTest, DownloadResourceThrottleCancels);
   friend class base::RefCountedThreadSafe<DownloadRequestLimiter>;
   friend class DownloadRequestLimiterTest;
   friend class TabDownloadState;
 
@@ skipping 11 matching lines @@
       content::WebContents* originating_web_contents,
       bool create);
 
   // Does the work of updating the download status on the UI thread and
   // potentially prompting the user.
   void CanDownloadImpl(content::WebContents* originating_contents,
                        const std::string& request_method,
                        const Callback& callback);
 
   // Invoked when decision to download has been made.
-  void OnCanDownloadDecided(int render_process_host_id,
-                            int render_view_id,
-                            const std::string& request_method,
-                            const Callback& orig_callback,
-                            bool allow);
+  void OnCanDownloadDecided(
+      const content::ResourceRequestInfo::WebContentsGetter&
+          web_contents_getter,
+      const std::string& request_method,
+      const Callback& orig_callback,
+      bool allow);
 
   // Removes the specified TabDownloadState from the internal map and deletes
   // it. This has the effect of resetting the status for the tab to
   // ALLOW_ONE_DOWNLOAD.
   void Remove(TabDownloadState* state, content::WebContents* contents);
 
   static HostContentSettingsMap* content_settings_;
   static HostContentSettingsMap* GetContentSettings(
       content::WebContents* contents);
 
   // Maps from tab to download state. The download state for a tab only exists
   // if the state is other than ALLOW_ONE_DOWNLOAD. Similarly once the state
   // transitions from anything but ALLOW_ONE_DOWNLOAD back to ALLOW_ONE_DOWNLOAD
   // the TabDownloadState is removed and deleted (by way of Remove).
   typedef std::map<content::WebContents*, TabDownloadState*> StateMap;
   StateMap state_map_;
 
   // Weak ptr factory used when |CanDownload| asks the delegate asynchronously
   // about the download.
   base::WeakPtrFactory<DownloadRequestLimiter> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadRequestLimiter);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_REQUEST_LIMITER_H_