[Downloads] Make DownloadTestObserverTerminal condition on IsDone

content/public/test/download_test_observer.h

Index: content/public/test/download_test_observer.h
diff --git a/content/public/test/download_test_observer.h b/content/public/test/download_test_observer.h
index c5e94765da7380f38e75712cf6e6e3e71a9e801f..03dd588ad79aedf622cf13434187f8d23371af21 100644
--- a/content/public/test/download_test_observer.h
+++ b/content/public/test/download_test_observer.h
@@ -170,7 +170,8 @@ class DownloadTestObserver : public DownloadManager::Observer,
 class DownloadTestObserverTerminal : public DownloadTestObserver {
  public:
   // Create an object that will be considered finished when |wait_count|
-  // download items have entered a terminal state (any but IN_PROGRESS).
+  // download items have entered a terminal state (DownloadItem::IsDone() is
+  // true).
   DownloadTestObserverTerminal(
       DownloadManager* download_manager,
       size_t wait_count,
@@ -204,6 +205,23 @@ class DownloadTestObserverInProgress : public DownloadTestObserver {
   DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverInProgress);
 };
 
+class DownloadTestObserverInterrupted : public DownloadTestObserver {
+ public:
+  // Create an object that will be considered finished when |wait_count|
+  // download items are interrupted.
+  DownloadTestObserverInterrupted(
+      DownloadManager* download_manager,
+      size_t wait_count,
+      DangerousDownloadAction dangerous_download_action);
+
+  virtual ~DownloadTestObserverInterrupted();
+
+ private:
+  virtual bool IsDownloadInFinalState(DownloadItem* download) OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(DownloadTestObserverInterrupted);
+};
+
 // The WaitForFlush() method on this class returns after:
 //      * There are no IN_PROGRESS download items remaining on the
 //        DownloadManager.