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

chrome/browser/download/download_danger_prompt_browsertest.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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 104 matching lines @@
   // The Accept action should cause the accept callback to be invoked.
   SetUpExpectations(DownloadDangerPrompt::ACCEPT);
   SimulatePromptAction(DownloadDangerPrompt::ACCEPT);
   VerifyExpectations();
 
   // The Discard action should cause the discard callback to be invoked.
   SetUpExpectations(DownloadDangerPrompt::CANCEL);
   SimulatePromptAction(DownloadDangerPrompt::CANCEL);
   VerifyExpectations();
 
-  // If the download is no longer in-progress, the dialog should dismiss itself.
-  SetUpExpectations(DownloadDangerPrompt::CANCEL);
-  EXPECT_CALL(download(), GetState()).WillOnce(
-      Return(content::DownloadItem::CANCELLED));
-  download_observer()->OnDownloadUpdated(&download());
-  VerifyExpectations();
-
   // If the download is no longer dangerous (because it was accepted), the
   // dialog should dismiss itself.
   SetUpExpectations(DownloadDangerPrompt::CANCEL);
-  EXPECT_CALL(download(), GetState()).WillOnce(
-      Return(content::DownloadItem::IN_PROGRESS));
   EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(false));
   download_observer()->OnDownloadUpdated(&download());
   VerifyExpectations();
 
+  // If the download is in a terminal state then the dialog should dismiss
+  // itself.
+  SetUpExpectations(DownloadDangerPrompt::CANCEL);
+  EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(true));
+  EXPECT_CALL(download(), IsDone()).WillOnce(Return(true));
+  download_observer()->OnDownloadUpdated(&download());
+  VerifyExpectations();
+
+  // If the download is dangerous and is not in a terminal state, don't dismiss
+  // the dialog.
+  SetUpExpectations(DownloadDangerPrompt::ACCEPT);
+  EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(true));
+  EXPECT_CALL(download(), IsDone()).WillOnce(Return(false));
+  download_observer()->OnDownloadUpdated(&download());
+  SimulatePromptAction(DownloadDangerPrompt::ACCEPT);
+  VerifyExpectations();
+
   // If the containing tab is closed, the dialog should be canceled.
   OpenNewTab();
   SetUpExpectations(DownloadDangerPrompt::CANCEL);
   chrome::CloseTab(browser());
   VerifyExpectations();
 }