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

chrome/browser/history/history_unittest.cc

 // Copyright (c) 2012 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.
 
 // History unit tests come in two flavors:
 //
 // 1. The more complicated style is that the unit test creates a full history
 //    service. This spawns a background thread for the history backend, and
 //    all communication is asynchronous. This is useful for testing more
 //    complicated things or end-to-end behavior.
@@ skipping 305 matching lines @@
   Time now = Time::Now();
   TimeDelta one_day = TimeDelta::FromDays(1);
   Time month_ago = now - TimeDelta::FromDays(30);
 
   // Initially there should be nothing in the downloads database.
   std::vector<DownloadPersistentStoreInfo> downloads;
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(0U, downloads.size());
 
   // Keep track of these as we need to update them later during the test.
-  DownloadID in_progress, removing;
+  DownloadID in_progress;
 
   // Create one with a 0 time.
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, Time()));
   // Create one for now and +/- 1 day.
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, now - one_day));
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, now));
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, now + one_day));
   // Try the other four states.
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE, month_ago));
   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_NE(0, removing = AddDownload(DownloadItem::REMOVING, month_ago));
 
   // Test to see if inserts worked.
   db_->QueryDownloads(&downloads);
-  EXPECT_EQ(9U, downloads.size());
+  EXPECT_EQ(8U, downloads.size());
 
   // Try removing from current timestamp. This should delete the one in the
   // future and one very recent one.
   db_->RemoveDownloadsBetween(now, Time());
   db_->QueryDownloads(&downloads);
-  EXPECT_EQ(7U, downloads.size());
+  EXPECT_EQ(6U, downloads.size());
 
   // Try removing from two months ago. This should not delete items that are
   // 'in progress' or in 'removing' state.
   db_->RemoveDownloadsBetween(now - TimeDelta::FromDays(60), Time());
   db_->QueryDownloads(&downloads);
-  EXPECT_EQ(3U, downloads.size());
+  EXPECT_EQ(2U, downloads.size());
 
   // Download manager converts to TimeT, which is lossy, so we do the same
   // for comparison.
   Time month_ago_lossy = Time::FromTimeT(month_ago.ToTimeT());
 
   // Make sure the right values remain.
   EXPECT_EQ(DownloadItem::COMPLETE, downloads[0].state);
   EXPECT_EQ(0, downloads[0].start_time.ToInternalValue());
   EXPECT_EQ(DownloadItem::IN_PROGRESS, downloads[1].state);
   EXPECT_EQ(month_ago_lossy.ToInternalValue(),
             downloads[1].start_time.ToInternalValue());
-  EXPECT_EQ(DownloadItem::REMOVING, downloads[2].state);
   EXPECT_EQ(month_ago_lossy.ToInternalValue(),
             downloads[2].start_time.ToInternalValue());
 
   // Change state so we can delete the downloads.
   DownloadPersistentStoreInfo data;
   data.received_bytes = 512;
   data.state = DownloadItem::COMPLETE;
   data.end_time = base::Time::Now();
   data.opened = false;
   data.db_handle = in_progress;
   EXPECT_TRUE(db_->UpdateDownload(data));
   data.state = DownloadItem::CANCELLED;
-  data.db_handle = removing;
   EXPECT_TRUE(db_->UpdateDownload(data));
 
   // Try removing from Time=0. This should delete all.
   db_->RemoveDownloadsBetween(Time(), Time());
   db_->QueryDownloads(&downloads);
   EXPECT_EQ(0U, downloads.size());
 
   // Check removal of downloads stuck in IN_PROGRESS state.
   EXPECT_NE(0, AddDownload(DownloadItem::COMPLETE,    month_ago));
   EXPECT_NE(0, AddDownload(DownloadItem::IN_PROGRESS, month_ago));
@@ skipping 565 matching lines @@
   history_service_ = history;
   history->ScheduleDBTask(task.get(), &request_consumer);
   request_consumer.CancelAllRequests();
   CleanupHistoryService();
   // WARNING: history has now been deleted.
   history = NULL;
   ASSERT_FALSE(task->done_invoked);
 }
 
 }  // namespace history