Cleanup CanDownload WebContentsDelegate API

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>
@@ skipping 171 matching lines @@
   DownloadRequestLimiter();
 
   // Returns the download status for a page. This does not change the state in
   // anyway.
   DownloadStatus GetDownloadStatus(content::WebContents* tab);
 
   // Updates the state of the page as necessary and notifies the callback.
   // WARNING: both this call and the callback are invoked on the io thread.
   void CanDownloadOnIOThread(int render_process_host_id,
                              int render_view_id,
-                             int request_id,
+                             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;
 
   ~DownloadRequestLimiter();
 
   // Gets the download state for the specified controller. If the
   // TabDownloadState does not exist and |create| is true, one is created.
   // See TabDownloadState's constructor description for details on the two
   // controllers.
   //
   // The returned TabDownloadState is owned by the DownloadRequestLimiter and
   // deleted when no longer needed (the Remove method is invoked).
   TabDownloadState* GetDownloadState(
       content::WebContents* web_contents,
       content::WebContents* originating_web_contents,
       bool create);
 
   // CanDownloadOnIOThread invokes this on the UI thread. This determines the
   // tab and invokes CanDownloadImpl.
   void CanDownload(int render_process_host_id,
                    int render_view_id,
-                   int request_id,
+                   const GURL& url,
                    const std::string& request_method,
                    const Callback& callback);
 
   // Does the work of updating the download status on the UI thread and
   // potentially prompting the user.
   void CanDownloadImpl(content::WebContents* originating_contents,
-                       int request_id,
                        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,
-                            int request_id,
                             const std::string& request_method,
                             const Callback& orig_callback,
                             bool allow);
 
   // Invoked on the UI thread. Schedules a call to NotifyCallback on the io
   // thread.
   void ScheduleNotification(const Callback& 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
@@ skipping 12 matching lines @@
   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_