Revert 102126 - Make cancel remove cancelled download from active queues at time of cancel.

content/browser/download/download_item.cc

 // Copyright (c) 2011 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/download_item.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 335 matching lines @@
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!IsInProgress()) {
     NOTREACHED();
     return;
   }
   UpdateSize(bytes_so_far);
   UpdateObservers();
 }
 
-void DownloadItem::Cancel() {
+// Triggered by a user action.
+void DownloadItem::Cancel(bool update_history) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
   VLOG(20) << __FUNCTION__ << "() download = " << DebugString(true);
-
-  // Small downloads might be complete before we have a chance to run.
-  if (!IsInProgress())
+  if (!IsPartialDownload()) {
+    // Small downloads might be complete before this method has
+    // a chance to run.
     return;
-
-  TransitionTo(CANCELLED);
+  }
 
   download_stats::RecordDownloadCount(download_stats::CANCELLED_COUNT);
 
-  // History insertion is the point at which we have finalized download
-  // details and persist them if something goes wrong.  Before history
-  // insertion, interrupt or cancel results in download removal.
-  if (db_handle() == DownloadItem::kUninitializedHandle) {
-    download_manager_->RemoveDownload(this);
-    // We are now deleted; no further code should be executed on this
-    // object.
-  }
+  TransitionTo(CANCELLED);
+  StopProgressTimer();
+  if (update_history)
+    download_manager_->DownloadCancelledInternal(this);
 }
 
 void DownloadItem::MarkAsComplete() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DCHECK(all_data_saved_);
   TransitionTo(COMPLETE);
 }
 
@@ skipping 38 matching lines @@
     // download shelf.
     if (!is_temporary())
       OpenDownload();
 
     auto_opened_ = true;
     UpdateObservers();
   }
 }
 
 void DownloadItem::TransitionTo(DownloadState new_state) {
-  DownloadState old_state = state_;
-  if (old_state == new_state)
+  if (state_ == new_state)
     return;
 
-  // Check for disallowed state transitions.
-  CHECK(!(old_state == IN_PROGRESS && new_state == REMOVING));
-
   state_ = new_state;
-
-  // Do special operations for transitions from an active state.
-  if (old_state == IN_PROGRESS &&
-      (new_state == CANCELLED || new_state == INTERRUPTED)) {
-    download_manager_->DownloadStopped(this);
-    StopProgressTimer();
-  }
-
   UpdateObservers();
 }
 
 void DownloadItem::UpdateSafetyState() {
   SafetyState updated_value(
       GetSafetyState(state_info_.is_dangerous_file,
                      state_info_.is_dangerous_url));
   if (updated_value != safety_state_) {
     safety_state_ = updated_value;
     UpdateObservers();
   }
 }
 
 void DownloadItem::UpdateTarget() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (state_info_.target_name.value().empty())
     state_info_.target_name = full_path_.BaseName();
 }
 
-void DownloadItem::Interrupt(int64 size, net::Error net_error) {
+void DownloadItem::Interrupted(int64 size, net::Error net_error) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  VLOG(20) << __FUNCTION__ << "() download = " << DebugString(true);
 
-  // Small downloads might be complete before we have a chance to run.
   if (!IsInProgress())
     return;
 
+  last_error_ = net_error;
   UpdateSize(size);
-  last_error_ = net_error;
-
-  TransitionTo(INTERRUPTED);
-
+  StopProgressTimer();
   download_stats::RecordDownloadInterrupted(net_error,
                                             received_bytes_,
                                             total_bytes_);
-
-  // History insertion is the point at which we have finalized download
-  // details and persist them if something goes wrong.  Before history
-  // insertion, interrupt or cancel results in download removal.
-  if (db_handle() == DownloadItem::kUninitializedHandle) {
-    download_manager_->RemoveDownload(this);
-    // We are now deleted; no further code should be executed on this
-    // object.
-  }
+  TransitionTo(INTERRUPTED);
 }
 
 void DownloadItem::Delete(DeleteReason reason) {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   switch (reason) {
     case DELETE_DUE_TO_USER_DISCARD:
       UMA_HISTOGRAM_ENUMERATION("Download.UserDiscard", GetDangerType(),
                                 DANGEROUS_TYPE_MAX);
@@ skipping 10 matching lines @@
       NewRunnableFunction(&DeleteDownloadedFile, full_path_));
   Remove();
   // We have now been deleted.
 }
 
 void DownloadItem::Remove() {
   // TODO(rdsmith): Change to DCHECK after http://crbug.com/85408 resolved.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   download_manager_->AssertQueueStateConsistent(this);
-  if (IsInProgress()) {
-    TransitionTo(CANCELLED);
-    download_stats::RecordDownloadCount(download_stats::CANCELLED_COUNT);
-  }
+  Cancel(true);
   download_manager_->AssertQueueStateConsistent(this);
-  download_stats::RecordDownloadCount(download_stats::REMOVED_COUNT);
 
-  download_manager_->RemoveDownload(this);
+  TransitionTo(REMOVING);
+  download_manager_->RemoveDownload(db_handle_);
   // We have now been deleted.
 }
 
 bool DownloadItem::TimeRemaining(base::TimeDelta* remaining) const {
   if (total_bytes_ <= 0)
     return false;  // We never received the content_length for this download.
 
   int64 speed = CurrentSpeed();
   if (speed == 0)
     return false;
@@ skipping 277 matching lines @@
         state_info_.target_name.value().c_str(),
         full_path().value().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
   }
 
   description += " }";
 
   return description;
 }