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

chrome/browser/download/download_test_observer.h

 // 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.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 42 matching lines @@
   virtual ~DownloadTestObserver();
 
   // Wait for the requested number of downloads to enter a terminal state.
   void WaitForFinished();
 
   // Return true if everything's happened that we're configured for.
   bool IsFinished() const;
 
   // content::DownloadItem::Observer
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
-  virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE {}
+  virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
 
   // content::DownloadManager::Observer
   virtual void ModelChanged(content::DownloadManager* manager) OVERRIDE;
 
   size_t NumDangerousDownloadsSeen() const;
 
   size_t NumDownloadsSeenInState(
       content::DownloadItem::DownloadState state) const;
 
  protected:
@@ skipping 121 matching lines @@
   explicit DownloadTestFlushObserver(
       content::DownloadManager* download_manager);
 
   void WaitForFlush();
 
   // DownloadsManager observer methods.
   virtual void ModelChanged(content::DownloadManager* manager) OVERRIDE;
 
   // DownloadItem observer methods.
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
-  virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE {}
+  virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
 
  protected:
   friend class base::RefCountedThreadSafe<DownloadTestFlushObserver>;
 
   virtual ~DownloadTestFlushObserver();
 
  private:
   typedef std::set<content::DownloadItem*> DownloadSet;
 
   // If we're waiting for that flush point, check the number
@@ skipping 70 matching lines @@
   // Returns true if a file chooser dialog was displayed since the last time
   // this method was called.
   bool TestAndResetDidShowFileChooser();
 
  private:
   scoped_refptr<internal::MockFileChooserDownloadManagerDelegate>
       test_delegate_;
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_