[Downloads] Make DownloadTestObserverTerminal condition on IsDone

content/public/test/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 CONTENT_TEST_DOWNLOAD_TEST_OBSERVER_H_
 #define CONTENT_TEST_DOWNLOAD_TEST_OBSERVER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 152 matching lines @@
   std::set<int32> dangerous_downloads_seen_;
 
   base::WeakPtrFactory<DownloadTestObserver> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestObserver);
 };
 
 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,
       DangerousDownloadAction dangerous_download_action);
 
   virtual ~DownloadTestObserverTerminal();
 
  private:
   virtual bool IsDownloadInFinalState(DownloadItem* download) OVERRIDE;
 
@@ skipping 13 matching lines @@
       DownloadManager* download_manager, size_t wait_count);
 
   virtual ~DownloadTestObserverInProgress();
 
  private:
   virtual bool IsDownloadInFinalState(DownloadItem* download) OVERRIDE;
 
   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.
 //      * There have been two round trip messages through the file and
 //        IO threads.
 // This almost certainly means that a Download cancel has propagated through
 // the system.
 class DownloadTestFlushObserver
     : public DownloadManager::Observer,
       public DownloadItem::Observer,
@@ skipping 68 matching lines @@
 
   // We are in the message loop.
   bool waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadTestItemCreationObserver);
 };
 
 }  // namespace content`
 
 #endif  // CONTENT_TEST_DOWNLOAD_TEST_OBSERVER_H_