Reland DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

content/browser/download/download_item_impl.cc

Index: content/browser/download/download_item_impl.cc
diff --git a/content/browser/download/download_item_impl.cc b/content/browser/download/download_item_impl.cc
index 3c9521d314180cf38803328d6e5e1da5d7dda4e0..462a704e4a2e75686646b50eda2d5f27ec68c6f3 100644
--- a/content/browser/download/download_item_impl.cc
+++ b/content/browser/download/download_item_impl.cc
@@ -86,8 +86,6 @@ const char* DebugDownloadStateString(DownloadItem::DownloadState state) {
       return "COMPLETE";
     case DownloadItem::CANCELLED:
       return "CANCELLED";
-    case DownloadItem::REMOVING:
-      return "REMOVING";
     case DownloadItem::INTERRUPTED:
       return "INTERRUPTED";
     default:
@@ -316,8 +314,7 @@ DownloadItemImpl::DownloadItemImpl(Delegate* delegate,
 
 DownloadItemImpl::~DownloadItemImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  TransitionTo(REMOVING);
+  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadDestroyed(this));
   STLDeleteContainerPairSecondPointers(
       external_data_map_.begin(), external_data_map_.end());
   delegate_->AssertStateConsistent(this);
@@ -661,7 +658,7 @@ void DownloadItemImpl::Remove() {
   Cancel(true);
   delegate_->AssertStateConsistent(this);
 
-  TransitionTo(REMOVING);
+  FOR_EACH_OBSERVER(Observer, observers_, OnDownloadRemoved(this));

[Randy Smith (Not in Mondays), 2012/07/14 19:25:53]

What about the RemoveDownloadsBetween path from the DownloadManager?

[benjhayden, 2012/07/23 15:43:09]

What about it?

[Randy Smith (Not in Mondays), 2012/07/23 18:30:42]

I don't believe it goes through the DII::Remove() path, and hence won't produce
an OnDownloadRemoved() notification.  Am I wrong?

[benjhayden, 2012/07/25 15:37:48]

Facepalm. PTAL.

   delegate_->DownloadRemoved(this);
   // We have now been deleted.
 }