[Resumption 10/12] Use DI::IsDone to check for terminal downloads.

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 203 matching lines @@
   if (waiting_ && IsFinished())
     base::MessageLoopForUI::current()->Quit();
 }
 
 void DownloadTestObserver::AcceptDangerousDownload(int32 download_id) {
   // Download manager was shutdown before the UI thread could accept the
   // download.
   if (!download_manager_)
     return;
   DownloadItem* download = download_manager_->GetDownload(download_id);
-  if (download && (download->GetState() == DownloadItem::IN_PROGRESS))
+  if (download && !download->IsDone())
     download->ValidateDangerousDownload();
 }
 
 void DownloadTestObserver::DenyDangerousDownload(int32 download_id) {
   // Download manager was shutdown before the UI thread could deny the
   // download.
   if (!download_manager_)
     return;
   DownloadItem* download = download_manager_->GetDownload(download_id);
-  if (download && (download->GetState() == DownloadItem::IN_PROGRESS)) {
+  if (download && !download->IsDone())
     download->Remove();
-  }
 }
 
 DownloadTestObserverTerminal::DownloadTestObserverTerminal(
     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;
@@ skipping 173 matching lines @@
     base::MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content