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

content/browser/download/save_package.cc

Index: content/browser/download/save_package.cc
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 15886f8dc162750353a76714f01619ec14f23952..4b7d1aba100fe2ac88c601be96630128e939c520 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -55,8 +55,11 @@ using base::Time;
 namespace content {
 namespace {
 
-// A counter for uniquely identifying each save package.
-int g_save_package_id = 0;
+// Generates unique ids for SavePackage::unique_id_ field.
+SavePackageId GetNextSavePackageId() {
+  static int g_save_package_id = 0;
+  return SavePackageId::FromUnsafeValue(g_save_package_id++);
+}
 
 // Default name which will be used when we can not get proper name from
 // resource URL.
@@ -159,7 +162,7 @@ SavePackage::SavePackage(WebContents* web_contents,
       all_save_items_count_(0),
       file_name_set_(&base::FilePath::CompareLessIgnoreCase),
       wait_state_(INITIALIZE),
-      unique_id_(g_save_package_id++),
+      unique_id_(GetNextSavePackageId()),
       wrote_to_completed_file_(false),
       wrote_to_failed_file_(false) {
   DCHECK(page_url_.is_valid());
@@ -191,7 +194,7 @@ SavePackage::SavePackage(WebContents* web_contents)
       all_save_items_count_(0),
       file_name_set_(&base::FilePath::CompareLessIgnoreCase),
       wait_state_(INITIALIZE),
-      unique_id_(g_save_package_id++),
+      unique_id_(GetNextSavePackageId()),
       wrote_to_completed_file_(false),
       wrote_to_failed_file_(false) {
   DCHECK(page_url_.is_valid());
@@ -220,7 +223,7 @@ SavePackage::SavePackage(WebContents* web_contents,
       all_save_items_count_(0),
       file_name_set_(&base::FilePath::CompareLessIgnoreCase),
       wait_state_(INITIALIZE),
-      unique_id_(g_save_package_id++),
+      unique_id_(GetNextSavePackageId()),
       wrote_to_completed_file_(false),
       wrote_to_failed_file_(false) {}