Allowing multiple SaveItems to have same URLs.

content/browser/download/save_item.cc

 // 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.
 
 #include "content/browser/download/save_item.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "content/browser/download/save_file.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/download/save_package.h"
+#include "content/public/browser/browser_thread.h"
 
 namespace content {
 
+namespace {
+
+int GetNextSaveItemId() {
+  static int g_next_save_item_id = 0;
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  return g_next_save_item_id++;
+}
+
+}  // namespace
+
 // Constructor for SaveItem when creating each saving job.
 SaveItem::SaveItem(const GURL& url,
                    const Referrer& referrer,
                    SavePackage* package,
                    SaveFileCreateInfo::SaveFileSource save_source)
-  : save_id_(-1),
-    url_(url),
-    referrer_(referrer),
-    total_bytes_(0),
-    received_bytes_(0),
-    state_(WAIT_START),
-    has_final_name_(false),
-    is_success_(false),
-    save_source_(save_source),
-    package_(package) {
+    : save_item_id_(GetNextSaveItemId()),
+      url_(url),
+      referrer_(referrer),
+      total_bytes_(0),
+      received_bytes_(0),
+      state_(WAIT_START),
+      has_final_name_(false),
+      is_success_(false),
+      save_source_(save_source),
+      package_(package) {
   DCHECK(package);
 }
 
 SaveItem::~SaveItem() {
 }
 
 // Set start state for save item.
 void SaveItem::Start() {
   DCHECK(state_ == WAIT_START);
   state_ = IN_PROGRESS;
@@ skipping 33 matching lines @@
   Finish(received_bytes_, false);
   package_->SaveCanceled(this);
 }
 
 // Set finish state for a save item
 void SaveItem::Finish(int64 size, bool is_success) {
   // When this function is called, the SaveItem should be one of following
   // three situations.
   // a) The data of this SaveItem is finished saving. So it should have
   // generated final name.
-  // b) Error happened before the start of saving process. So no |save_id_| is
-  // generated for this SaveItem and the |is_success_| should be false.
-  // c) Error happened in the start of saving process, the SaveItem has a save
-  // id, |is_success_| should be false, and the |size| should be 0.
-  DCHECK(has_final_name() || (save_id_ == -1 && !is_success_) ||
-         (save_id_ != -1 && !is_success_ && !size));
+  // b) Error happened before the start of saving process.
+  // c) Error happened in the start of saving process.

[Randy Smith (Not in Mondays), 2015/12/03 20:58:28]

nit: I think this comment was originally intended to parallel the three elements
of the DCHECK, so I'd suggest updating it to just be a) finished, b) error.  And
truth to tell, that doesn't really need a bulleted list, and might not need a
comment at all (up to you); the DHCECK is pretty clear.

[Łukasz Anforowicz, 2015/12/04 21:16:45]

Done (I've removed the comment altogether - I agree that the comment might be an
overkill right now).

+  DCHECK(has_final_name() || !is_success_);
   state_ = COMPLETE;
   is_success_ = is_success;
   UpdateSize(size);
 }
 
 // Calculate the percentage of the save item
 int SaveItem::PercentComplete() const {
   switch (state_) {
     case COMPLETE:
     case CANCELED:
@@ skipping 14 matching lines @@
 }
 
 // Rename the save item with new path.
 void SaveItem::Rename(const base::FilePath& full_path) {
   DCHECK(!full_path.empty() && !has_final_name());
   full_path_ = full_path;
   file_name_ = full_path_.BaseName();
   has_final_name_ = true;
 }
 
-void SaveItem::SetSaveId(int32 save_id) {
-  DCHECK_EQ(-1, save_id_);
-  save_id_ = save_id;
-}
-
 void SaveItem::SetTotalBytes(int64 total_bytes) {
   DCHECK_EQ(0, total_bytes_);
   total_bytes_ = total_bytes;
 }
 
 }  // namespace content