Revert 149794 - 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 67 matching lines @@
     content::RunMessageLoop();
     waiting_ = false;
   }
 }
 
 bool DownloadTestObserver::IsFinished() const {
   return (finished_downloads_.size() - finished_downloads_at_construction_ >=
           wait_count_);
 }
 
-void DownloadTestObserver::OnDownloadDestroyed(DownloadItem* download) {
+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.
-  DownloadSet::iterator it = downloads_observed_.find(download);
-  ASSERT_TRUE(it != downloads_observed_.end());
-  downloads_observed_.erase(it);
-  download->RemoveObserver(this);
-}
+  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;
+  }
 
-void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
   // 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 152 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   download_manager_->AddObserver(this);
   content::RunMessageLoop();
 }
 
 void DownloadTestFlushObserver::ModelChanged(DownloadManager* manager) {
   // Model has changed, so there may be more DownloadItems to observe.
   CheckDownloadsInProgress(true);
 }
 
-void DownloadTestFlushObserver::OnDownloadDestroyed(DownloadItem* download) {
+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.
-  DownloadSet::iterator it = downloads_observed_.find(download);
-  ASSERT_TRUE(it != downloads_observed_.end());
-  downloads_observed_.erase(it);
-  download->RemoveObserver(this);
-}
+  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;
+  }
 
-void DownloadTestFlushObserver::OnDownloadUpdated(DownloadItem* download) {
   // 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 153 matching lines @@
 DownloadTestFileChooserObserver::~DownloadTestFileChooserObserver() {
 }
 
 void DownloadTestFileChooserObserver::EnableFileChooser(bool enable) {
   test_delegate_->EnableFileChooser(enable);
 }
 
 bool DownloadTestFileChooserObserver::TestAndResetDidShowFileChooser() {
   return test_delegate_->TestAndResetDidShowFileChooser();
 }