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

chrome/browser/history/history_unittest.cc

Index: chrome/browser/history/history_unittest.cc
diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc
index 8b8eb3de7eae9d37cf817d55968ca37d9491a4e1..bd350efb2b618be9d631a5cc25135b9826c8a22a 100644
--- a/chrome/browser/history/history_unittest.cc
+++ b/chrome/browser/history/history_unittest.cc
@@ -337,7 +337,6 @@ TEST_F(HistoryTest, ClearBrowsingData_Downloads) {
   EXPECT_NE(0, in_progress = AddDownload(DownloadItem::IN_PROGRESS, month_ago));
   EXPECT_NE(0, AddDownload(DownloadItem::CANCELLED, month_ago));
   EXPECT_NE(0, AddDownload(DownloadItem::INTERRUPTED, month_ago));
-  EXPECT_EQ(0, AddDownload(DownloadItem::REMOVING, month_ago));
 
   // Test to see if inserts worked.
   db_->QueryDownloads(&downloads);
@@ -374,6 +373,8 @@ TEST_F(HistoryTest, ClearBrowsingData_Downloads) {
   data.opened = false;
   data.db_handle = in_progress;
   EXPECT_TRUE(db_->UpdateDownload(data));
+  data.state = DownloadItem::CANCELLED;
+  EXPECT_TRUE(db_->UpdateDownload(data));
 
   // Try removing from Time=0. This should delete all.
   db_->RemoveDownloadsBetween(Time(), Time());