sql::MetaTable.next_download_id, DownloadManager::GetNextId()

chrome/browser/renderer_host/download_resource_handler.h

Index: chrome/browser/renderer_host/download_resource_handler.h
diff --git a/chrome/browser/renderer_host/download_resource_handler.h b/chrome/browser/renderer_host/download_resource_handler.h
index 67ad0eecd41f9db8a5cde8a3d8ca164e610072d7..c50d6f6d99393cde7886bb61221fc448d5d22e07 100644
--- a/chrome/browser/renderer_host/download_resource_handler.h
+++ b/chrome/browser/renderer_host/download_resource_handler.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/download/download_file.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_handler.h"
+#include "chrome/browser/download/download_manager.h"
 
 class DownloadFileManager;
 class ResourceDispatcherHost;
@@ -25,15 +26,17 @@ class URLRequest;
 // Forwards data to the download thread.
 class DownloadResourceHandler : public ResourceHandler {
  public:
-  DownloadResourceHandler(ResourceDispatcherHost* rdh,
-                          int render_process_host_id,
-                          int render_view_id,
-                          int request_id,
-                          const GURL& url,
-                          DownloadFileManager* download_file_manager,
-                          net::URLRequest* request,
-                          bool save_as,
-                          const DownloadSaveInfo& save_info);
+  DownloadResourceHandler(
+      ResourceDispatcherHost* rdh,
+      int render_process_host_id,
+      int render_view_id,
+      int request_id,
+      const GURL& url,
+      const DownloadManager::GetNextIdThunkType& get_next_id,

[Randy Smith (Not in Mondays), 2011/07/25 20:20:12]

My preference would be for DRH to actually take an id as an argument, rather
than the ability to get an id.  That sets us up well for the situations where
the id is either already allocated (resumption) or allocated on the UI thread (a
couple of the programmatic interfaces to downloading).

[benjhayden, 2011/07/27 19:40:54]

Done.

+      DownloadFileManager* download_file_manager,
+      net::URLRequest* request,
+      bool save_as,
+      const DownloadSaveInfo& save_info);
 
   virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
 
@@ -75,12 +78,13 @@ class DownloadResourceHandler : public ResourceHandler {
 
   void StartPauseTimer();
 
-  int download_id_;
+  DownloadId download_id_;
   GlobalRequestID global_id_;
   int render_view_id_;
   scoped_refptr<net::IOBuffer> read_buffer_;
   std::string content_disposition_;
   int64 content_length_;
+  DownloadManager::GetNextIdThunkType get_next_id_;
   DownloadFileManager* download_file_manager_;
   net::URLRequest* request_;
   bool save_as_;  // Request was initiated via "Save As" by the user.