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

content/public/browser/download_item.h

Index: content/public/browser/download_item.h
diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h
index 84ca1602d356436a1dab627bc51ea2f7aafae785..ea5b20cb45264676430dd5f9262f5419a9d585de 100644
--- a/content/public/browser/download_item.h
+++ b/content/public/browser/download_item.h
@@ -62,10 +62,6 @@ class CONTENT_EXPORT DownloadItem {
     // Download has been cancelled.
     CANCELLED,
 
-    // This state indicates that the download item is about to be destroyed,
-    // and observers seeing this state should release all references.
-    REMOVING,
-
     // This state indicates that the download has been interrupted.
     INTERRUPTED,
 
@@ -103,10 +99,18 @@ class CONTENT_EXPORT DownloadItem {
   // to receive updates to the download's status.
   class CONTENT_EXPORT Observer {
    public:
-    virtual void OnDownloadUpdated(DownloadItem* download) = 0;
+    virtual void OnDownloadUpdated(DownloadItem* download) {}
 
     // Called when a downloaded file has been opened.
-    virtual void OnDownloadOpened(DownloadItem* download) = 0;
+    virtual void OnDownloadOpened(DownloadItem* download) {}
+
+    // Called when the user removed the download from history.

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

nit: The action is the user removing the download (the history isn't really
relevant), so I'd change this to "Called when the user removes a Download".

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

Done.

+    virtual void OnDownloadRemoved(DownloadItem* download) {}
+
+    // Called when the download is being destroyed. This happens after
+    // every OnDownloadRemoved() as well as when the DownloadManager is going
+    // down.
+    virtual void OnDownloadDestroyed(DownloadItem* download) {}
 
    protected:
     virtual ~Observer() {}