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

content/browser/download/save_file_manager.cc

Index: content/browser/download/save_file_manager.cc
diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc
index 3b6cd22715f673ce6ffff738caa5642dc748a21a..17fdc092bc81a65ff6d4bc3ec18e82136d741493 100644
--- a/content/browser/download/save_file_manager.cc
+++ b/content/browser/download/save_file_manager.cc
@@ -68,7 +68,7 @@ void SaveFileManager::RegisterStartingRequest(const GURL& save_url,
                                               SavePackage* save_package) {
   // Make sure it runs in the UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  int save_package_id = save_package->id();
+  SavePackageId save_package_id = save_package->id();
 
   // Register this starting request.
   StartingRequestsMap& starting_requests =
@@ -78,8 +78,9 @@ void SaveFileManager::RegisterStartingRequest(const GURL& save_url,
   DCHECK(never_present);
 }
 
-SavePackage* SaveFileManager::UnregisterStartingRequest(const GURL& save_url,
-                                                        int save_package_id) {
+SavePackage* SaveFileManager::UnregisterStartingRequest(
+    const GURL& save_url,
+    SavePackageId save_package_id) {
   // Make sure it runs in UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -267,7 +268,7 @@ void SaveFileManager::UpdateSaveProgress(int save_id,
 // delete it.
 void SaveFileManager::SaveFinished(int save_id,
                                    const GURL& save_url,
-                                   int save_package_id,
+                                   SavePackageId save_package_id,
                                    bool is_success) {
   DVLOG(20) << " " << __FUNCTION__ << "()"
             << " save_id = " << save_id << " save_url = \"" << save_url.spec()
@@ -356,7 +357,7 @@ void SaveFileManager::OnSaveFinished(int save_id,
 }
 
 void SaveFileManager::OnErrorFinished(const GURL& save_url,
-                                      int save_package_id) {
+                                      SavePackageId save_package_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   SavePackage* save_package =
       UnregisterStartingRequest(save_url, save_package_id);
@@ -368,7 +369,7 @@ void SaveFileManager::OnErrorFinished(const GURL& save_url,
 
 void SaveFileManager::OnSaveURL(const GURL& url,
                                 const Referrer& referrer,
-                                int save_package_id,
+                                SavePackageId save_package_id,
                                 int render_process_host_id,
                                 int render_view_routing_id,
                                 int render_frame_routing_id,
@@ -440,7 +441,7 @@ void SaveFileManager::CancelSave(int save_id) {
 // using specified save_id, just return.
 void SaveFileManager::SaveLocalFile(const GURL& original_file_url,
                                     int save_id,
-                                    int save_package_id) {
+                                    SavePackageId save_package_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   SaveFile* save_file = LookupSaveFile(save_id);
   if (!save_file)
@@ -481,7 +482,7 @@ void SaveFileManager::RenameAllFiles(const FinalNameList& final_names,
                                      const base::FilePath& resource_dir,
                                      int render_process_id,
                                      int render_frame_routing_id,
-                                     int save_package_id) {
+                                     SavePackageId save_package_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   if (!resource_dir.empty() && !base::PathExists(resource_dir))
@@ -507,7 +508,7 @@ void SaveFileManager::RenameAllFiles(const FinalNameList& final_names,
 
 void SaveFileManager::OnFinishSavePageJob(int render_process_id,
                                           int render_frame_routing_id,
-                                          int save_package_id) {
+                                          SavePackageId save_package_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   SavePackage* save_package =