Introducing SavePackageId and SaveItemId as distinct IdType<...>-based types.

content/browser/download/save_package.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 CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 #define CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 92 matching lines @@
   // written to disk.
   bool Init(const SavePackageDownloadCreatedCallback& cb);
 
   // Cancel all in progress request, might be called by user or internal error.
   void Cancel(bool user_action);
 
   void Finish();
 
   // Notifications sent from the file thread to the UI thread.
   void StartSave(const SaveFileCreateInfo* info);
-  bool UpdateSaveProgress(int32_t save_item_id,
+  bool UpdateSaveProgress(SaveItemId save_item_id,
                           int64_t size,
                           bool write_success);
-  void SaveFinished(int32_t save_item_id, int64_t size, bool is_success);
+  void SaveFinished(SaveItemId save_item_id, int64_t size, bool is_success);
   void SaveCanceled(SaveItem* save_item);
 
   // Rough percent complete, -1 means we don't know (since we didn't receive a
   // total size).
   int PercentComplete();
 
   bool canceled() const { return user_canceled_ || disk_error_occurred_; }
   bool finished() const { return finished_; }
   SavePageType save_type() const { return save_type_; }
-  int id() const { return unique_id_; }
+
+  SavePackageId id() const { return unique_id_; }
 
   void GetSaveInfo();
 
  private:
   friend class base::RefCountedThreadSafe<SavePackage>;
 
   void InitWithDownloadItem(
       const SavePackageDownloadCreatedCallback& download_created_callback,
       DownloadItemImpl* item);
 
@@ skipping 112 matching lines @@
   void GetSerializedHtmlWithLocalLinksForFrame(FrameTreeNode* target_tree_node);
 
   // Routes html data (sent by renderer process in response to
   // GetSerializedHtmlWithLocalLinksForFrame above) to the associated local file
   // (and also keeps track of when all frames have been completed).
   void OnSerializedHtmlWithLocalLinksResponse(RenderFrameHostImpl* sender,
                                               const std::string& data,
                                               bool end_of_data);
 
   // Look up SaveItem by save item id from in progress map.
-  SaveItem* LookupSaveItemInProcess(int32_t save_item_id);
+  SaveItem* LookupSaveItemInProcess(SaveItemId save_item_id);
 
   // Remove SaveItem from in progress map and put it to saved map.
   void PutInProgressItemToSavedMap(SaveItem* save_item);
 
   // Retrieves the URL to be saved from the WebContents.
   GURL GetUrlToBeSaved();
 
   void CreateDirectoryOnFileThread(const base::FilePath& website_save_dir,
                                    const base::FilePath& download_save_dir,
                                    bool skip_dir_check,
                                    const std::string& mime_type,
                                    const std::string& accept_langs);
   void ContinueGetSaveInfo(const base::FilePath& suggested_path,
                            bool can_save_as_complete);
   void OnPathPicked(
       const base::FilePath& final_name,
       SavePageType type,
       const SavePackageDownloadCreatedCallback& cb);
 
   // Map from SaveItem::id() (aka save_item_id) into a SaveItem.
-  typedef base::hash_map<int, SaveItem*> SaveItemIdMap;
+  typedef base::hash_map<SaveItemId, SaveItem*> SaveItemIdMap;
   // in_progress_items_ is map of all saving job in in-progress state.
   SaveItemIdMap in_progress_items_;
   // saved_failed_items_ is map of all saving job which are failed.
   SaveItemIdMap saved_failed_items_;
 
   // The number of in process SaveItems.
   int in_process_count() const {
     return static_cast<int>(in_progress_items_.size());
   }
 
@@ skipping 52 matching lines @@
   // (i.e. to prevent information disclosure to oop frames).
   // Note that |frame_tree_node_id_to_contained_save_items_| does NOT own
   // SaveItems - they remain owned by waiting_item_queue_, in_progress_items_,
   // etc.
   base::hash_map<int, std::vector<SaveItem*>>
       frame_tree_node_id_to_contained_save_items_;
 
   // Number of frames that we still need to get a response from.
   int number_of_frames_pending_response_;
 
-  typedef base::hash_map<int32_t, SaveItem*> SavedItemMap;
   // saved_success_items_ is map of all saving job which are successfully saved.
-  SavedItemMap saved_success_items_;
+  base::hash_map<SaveItemId, SaveItem*> saved_success_items_;
 
   // Non-owning pointer for handling file writing on the file thread.
   SaveFileManager* file_manager_;
 
   // DownloadManager owns the DownloadItem and handles history and UI.
   DownloadManagerImpl* download_manager_;
   DownloadItemImpl* download_;
 
   // The URL of the page the user wants to save.
   GURL page_url_;
@@ skipping 33 matching lines @@
 
   typedef base::hash_map<base::FilePath::StringType, uint32_t> FileNameCountMap;
   // This map is used to track serial number for specified filename.
   FileNameCountMap file_name_count_map_;
 
   // Indicates current waiting state when SavePackage try to get something
   // from outside.
   WaitState wait_state_;
 
   // Unique ID for this SavePackage.
-  const int unique_id_;
+  const SavePackageId unique_id_;
 
   // Variables to record errors that happened so we can record them via
   // UMA statistics.
   bool wrote_to_completed_file_;
   bool wrote_to_failed_file_;
 
   friend class SavePackageTest;
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestSuggestedSaveNames);
   FRIEND_TEST_ALL_PREFIXES(SavePackageTest, TestLongSafePureFilename);
 
   DISALLOW_COPY_AND_ASSIGN(SavePackage);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_SAVE_PACKAGE_H_