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

chrome/browser/download/download_test_observer.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.
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 65 matching lines @@
   }
 }
 
 bool DownloadTestObserver::IsFinished() const {
   if (finished_downloads_.size() - finished_downloads_at_construction_ >=
       wait_count_)
     return true;
   return (finish_on_select_file_ && select_file_dialog_seen_);
 }
 
+void DownloadTestObserver::OnDownloadDestructed(DownloadItem* download) {
+  // Stop observing.  Do not do anything with it, as it is about to be gone.
+  DownloadSet::iterator it = downloads_observed_.find(download);
+  ASSERT_TRUE(it != downloads_observed_.end());
+  downloads_observed_.erase(it);
+  download->RemoveObserver(this);
+}
+
 void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
-  // The REMOVING state indicates that the download is being destroyed.
-  // Stop observing.  Do not do anything with it, as it is about to be gone.
-  if (download->GetState() == DownloadItem::REMOVING) {
-    DownloadSet::iterator it = downloads_observed_.find(download);
-    ASSERT_TRUE(it != downloads_observed_.end());
-    downloads_observed_.erase(it);
-    download->RemoveObserver(this);
-    return;
-  }
-
   // Real UI code gets the user's response after returning from the observer.
   if (download->GetSafetyState() == DownloadItem::DANGEROUS &&
       !ContainsKey(dangerous_downloads_seen_, download->GetId())) {
     dangerous_downloads_seen_.insert(download->GetId());
 
     // Calling DangerousDownloadValidated() at this point will
     // cause the download to be completed twice.  Do what the real UI
     // code does: make the call as a delayed task.
     switch (dangerous_download_action_) {
       case ON_DANGEROUS_DOWNLOAD_ACCEPT:
@@ skipping 163 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   download_manager_->AddObserver(this);
   ui_test_utils::RunMessageLoop();
 }
 
 void DownloadTestFlushObserver::ModelChanged(DownloadManager* manager) {
   // Model has changed, so there may be more DownloadItems to observe.
   CheckDownloadsInProgress(true);
 }
 
+void DownloadTestFlushObserver::OnDownloadDestructed(DownloadItem* download) {
+  // Stop observing.  Do not do anything with it, as it is about to be gone.
+  DownloadSet::iterator it = downloads_observed_.find(download);
+  ASSERT_TRUE(it != downloads_observed_.end());
+  downloads_observed_.erase(it);
+  download->RemoveObserver(this);
+}
+
 void DownloadTestFlushObserver::OnDownloadUpdated(DownloadItem* download) {
-  // The REMOVING state indicates that the download is being destroyed.
-  // Stop observing.  Do not do anything with it, as it is about to be gone.
-  if (download->GetState() == DownloadItem::REMOVING) {
-    DownloadSet::iterator it = downloads_observed_.find(download);
-    ASSERT_TRUE(it != downloads_observed_.end());
-    downloads_observed_.erase(it);
-    download->RemoveObserver(this);
-    return;
-  }
-
   // No change in DownloadItem set on manager.
   CheckDownloadsInProgress(false);
 }
 
 DownloadTestFlushObserver::~DownloadTestFlushObserver() {
   download_manager_->RemoveObserver(this);
   for (DownloadSet::iterator it = downloads_observed_.begin();
        it != downloads_observed_.end(); ++it) {
     (*it)->RemoveObserver(this);
   }
@@ skipping 93 matching lines @@
   if (waiting_)
     MessageLoopForUI::current()->Quit();
 }
 
 const content::DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }