Revert 149794 - DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

content/browser/download/download_item_impl_unittest.cc

Index: content/browser/download/download_item_impl_unittest.cc
===================================================================
--- content/browser/download/download_item_impl_unittest.cc	(revision 150095)
+++ content/browser/download/download_item_impl_unittest.cc	(working copy)
@@ -131,43 +131,17 @@
  public:
   class MockObserver : public DownloadItem::Observer {
    public:
-    explicit MockObserver(DownloadItem* item)
-      : item_(item),
-        removed_(false),
-        destroyed_(false),
-        updated_(false) {
+    explicit MockObserver(DownloadItem* item) : item_(item), updated_(false) {
       item_->AddObserver(this);
     }
+    ~MockObserver() { item_->RemoveObserver(this); }
 
-    virtual ~MockObserver() {
-      if (item_) item_->RemoveObserver(this);
-    }
-
-    virtual void OnDownloadRemoved(DownloadItem* download) {
-      removed_ = true;
-    }
-
     virtual void OnDownloadUpdated(DownloadItem* download) {
       updated_ = true;
     }
 
-    virtual void OnDownloadOpened(DownloadItem* download) {
-    }
+    virtual void OnDownloadOpened(DownloadItem* download) { }
 
-    virtual void OnDownloadDestroyed(DownloadItem* download) {
-      destroyed_ = true;
-      item_->RemoveObserver(this);
-      item_ = NULL;
-    }
-
-    bool CheckRemoved() {
-      return removed_;
-    }
-
-    bool CheckDestroyed() {
-      return destroyed_;
-    }
-
     bool CheckUpdated() {
       bool was_updated = updated_;
       updated_ = false;
@@ -176,8 +150,6 @@
 
    private:
     DownloadItem* item_;
-    bool removed_;
-    bool destroyed_;
     bool updated_;
   };
 
@@ -330,21 +302,12 @@
   ASSERT_TRUE(observer.CheckUpdated());
 }
 
-TEST_F(DownloadItemTest, NotificationAfterDestroyed) {
-  DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
-  MockObserver observer(item);
-
-  DestroyDownloadItem(item);
-  ASSERT_TRUE(observer.CheckDestroyed());
-}
-
 TEST_F(DownloadItemTest, NotificationAfterRemove) {
   DownloadItemImpl* item = CreateDownloadItem(DownloadItem::IN_PROGRESS);
   MockObserver observer(item);
 
   item->Remove();
   ASSERT_TRUE(observer.CheckUpdated());
-  ASSERT_TRUE(observer.CheckRemoved());
 }
 
 TEST_F(DownloadItemTest, NotificationAfterOnContentCheckCompleted) {