[Downloads] Make DownloadTestObserverTerminal condition on IsDone

content/public/test/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 "content/public/test/download_test_observer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 237 matching lines @@
   // instead.  In this case, it's because of |IsDownloadInFinalState()|.
   Init();
 }
 
 DownloadTestObserverTerminal::~DownloadTestObserverTerminal() {
 }
 
 
 bool DownloadTestObserverTerminal::IsDownloadInFinalState(
     DownloadItem* download) {
-  return (download->GetState() != DownloadItem::IN_PROGRESS);
+  return download->IsDone();
 }
 
 DownloadTestObserverInProgress::DownloadTestObserverInProgress(
     DownloadManager* download_manager,
     size_t wait_count)
         : DownloadTestObserver(download_manager,
                                wait_count,
                                ON_DANGEROUS_DOWNLOAD_ACCEPT) {
   // You can't override virtual functions in a base class constructor; the
   // virtual function table hasn't been set up yet.  So, we have to do any
   // work that depends on those functions in the derived class constructor
   // instead.  In this case, it's because of |IsDownloadInFinalState()|.
   Init();
 }
 
 DownloadTestObserverInProgress::~DownloadTestObserverInProgress() {
 }
 
 
 bool DownloadTestObserverInProgress::IsDownloadInFinalState(
     DownloadItem* download) {
   return (download->GetState() == DownloadItem::IN_PROGRESS) &&
       !download->GetTargetFilePath().empty();
 }
 
+DownloadTestObserverInterrupted::DownloadTestObserverInterrupted(
+    DownloadManager* download_manager,
+    size_t wait_count,
+    DangerousDownloadAction dangerous_download_action)
+        : DownloadTestObserver(download_manager,
+                               wait_count,
+                               dangerous_download_action) {
+  // You can't rely on overriden virtual functions in a base class constructor;
+  // the virtual function table hasn't been set up yet.  So, we have to do any
+  // work that depends on those functions in the derived class constructor
+  // instead.  In this case, it's because of |IsDownloadInFinalState()|.
+  Init();
+}
+
+DownloadTestObserverInterrupted::~DownloadTestObserverInterrupted() {
+}
+
+
+bool DownloadTestObserverInterrupted::IsDownloadInFinalState(
+    DownloadItem* download) {
+  return download->GetState() == DownloadItem::INTERRUPTED;
+}
+
 DownloadTestFlushObserver::DownloadTestFlushObserver(
     DownloadManager* download_manager)
     : download_manager_(download_manager),
       waiting_for_zero_inprogress_(true) {}
 
 void DownloadTestFlushObserver::WaitForFlush() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   download_manager_->AddObserver(this);
   // The wait condition may have been met before WaitForFlush() was called.
   CheckDownloadsInProgress(true);
@@ skipping 125 matching lines @@
     base::MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content