ABANDONED CL: Introducing a compile-time-safe SavePackageId type.

content/browser/download/save_file_manager.h

Index: content/browser/download/save_file_manager.h
diff --git a/content/browser/download/save_file_manager.h b/content/browser/download/save_file_manager.h
index d42bafa36aacc54c129a595b1e6388598631a933..cdcbac793da67466d902122fa4fb8d0a88ca0a11 100644
--- a/content/browser/download/save_file_manager.h
+++ b/content/browser/download/save_file_manager.h
@@ -111,7 +111,7 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
   void UpdateSaveProgress(int save_id, net::IOBuffer* data, int size);
   void SaveFinished(int save_id,
                     const GURL& save_url,
-                    int save_package_id,
+                    SavePackageId save_package_id,
                     bool is_success);
 
   // Notifications sent from the UI thread and run on the file thread.
@@ -130,7 +130,7 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
   // original url is using file scheme.
   void SaveLocalFile(const GURL& original_file_url,
                      int save_id,
-                     int save_package_id);
+                     SavePackageId save_package_id);
 
   // Renames all the successfully saved files.
   // |final_names| points to a vector which contains pairs of save ids and
@@ -139,7 +139,7 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
                       const base::FilePath& resource_dir,
                       int render_process_id,
                       int render_frame_routing_id,
-                      int save_package_id);
+                      SavePackageId save_package_id);
 
   // When the user cancels the saving, we need to remove all remaining saved
   // files of this page saving job from save_file_map_.
@@ -165,7 +165,7 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
   // Unregister a start request according save URL, disassociate
   // the save URL and SavePackage.
   SavePackage* UnregisterStartingRequest(const GURL& save_url,
-                                         int save_package_id);
+                                         SavePackageId save_package_id);
 
   // Look up the SavePackage according to save id.
   SavePackage* LookupPackage(int save_id);
@@ -192,11 +192,11 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
   void OnSaveFinished(int save_id, int64 bytes_so_far, bool is_success);
   // For those requests that do not have valid save id, use
   // map:(url, SavePackage) to find the request and remove it.
-  void OnErrorFinished(const GURL& save_url, int save_package_id);
+  void OnErrorFinished(const GURL& save_url, SavePackageId save_package_id);
   // Notifies SavePackage that the whole page saving job is finished.
   void OnFinishSavePageJob(int render_process_id,
                            int render_frame_routing_id,
-                           int save_package_id);
+                           SavePackageId save_package_id);
 
   // Notifications sent from the UI thread and run on the file thread.
 
@@ -208,10 +208,10 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
   // Initiates a request for URL to be saved.
   void OnSaveURL(const GURL& url,
                  const Referrer& referrer,
+                 SavePackageId save_package_id,
                  int render_process_host_id,
                  int render_view_routing_id,
                  int render_frame_routing_id,
-                 int save_package_id,
                  ResourceContext* context);
   // Handler for a notification sent to the IO thread for generating save id.
   void OnRequireSaveJobFromOtherSource(SaveFileCreateInfo* info);
@@ -242,7 +242,8 @@ class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> {
   // hashmap since it is possible to save the same URL in different contents at
   // same time.
   typedef base::hash_map<std::string, SavePackage*> StartingRequestsMap;
-  typedef base::hash_map<int, StartingRequestsMap>
+  // TODO(lukasza): Use std::unordered_map instead?
+  typedef base::hash_map<SavePackageId, StartingRequestsMap>
       ContentsToStartingRequestsMap;
   ContentsToStartingRequestsMap contents_starting_requests_;