[Downloads] Allow acquiring dangerous download file.

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 14 matching lines @@
 // their actual posting.  Once posted, there is no connection between
 // these routines and the DownloadTestObserver class from which
 // they came, so the DownloadTestObserver's reference to the
 // DownloadManager cannot be counted on to keep the DownloadManager around.
 
 // Fake user click on "Accept".
 void AcceptDangerousDownload(scoped_refptr<DownloadManager> download_manager,
                              int32 download_id) {
   DownloadItem* download = download_manager->GetDownload(download_id);
   if (download && (download->GetState() == DownloadItem::IN_PROGRESS))
-    download->DangerousDownloadValidated();
+    download->ValidateDangerousDownload();
 }
 
 // Fake user click on "Deny".
 void DenyDangerousDownload(scoped_refptr<DownloadManager> download_manager,
                            int32 download_id) {
   DownloadItem* download = download_manager->GetDownload(download_id);
   if (download && (download->GetState() == DownloadItem::IN_PROGRESS)) {
     download->Cancel(true);
-    download->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
+    download->DiscardDangerousDownload(DownloadItem::DELETE_DUE_TO_USER_DISCARD,
+                                       DownloadItem::AcquireFileCallback());
   }
 }
 
 }  // namespace
 
 DownloadUpdatedObserver::DownloadUpdatedObserver(
     DownloadItem* item, DownloadUpdatedObserver::EventFilter filter)
     : item_(item),
       filter_(filter),
       waiting_(false),
@@ skipping 100 matching lines @@
   downloads_observed_.erase(it);
   download->RemoveObserver(this);
 }
 
 void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
   // Real UI code gets the user's response after returning from the observer.
   if (download->IsDangerous() &&
       !ContainsKey(dangerous_downloads_seen_, download->GetId())) {
     dangerous_downloads_seen_.insert(download->GetId());
 
-    // Calling DangerousDownloadValidated() at this point will
+    // Calling ValidateDangerousDownload() at this point will
     // cause the download to be completed twice.  Do what the real UI
     // code does: make the call as a delayed task.
     switch (dangerous_download_action_) {
       case ON_DANGEROUS_DOWNLOAD_ACCEPT:
         // Fake user click on "Accept".  Delay the actual click, as the
         // real UI would.
         BrowserThread::PostTask(
             BrowserThread::UI, FROM_HERE,
             base::Bind(&AcceptDangerousDownload, download_manager_,
                        download->GetId()));
@@ skipping 242 matching lines @@
     base::MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content