Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: content/public/test/download_test_observer.cc

Issue 14947007: [Downloads] Allow acquiring dangerous download file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rename methods for consistency Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/test/download_test_observer.cc
diff --git a/content/public/test/download_test_observer.cc b/content/public/test/download_test_observer.cc
index 3d918255c6d8f5bbd7e87f9b93dd3513e04d93c3..a2ae2c890d60cab65847ed2d8bd4753e90a281d6 100644
--- a/content/public/test/download_test_observer.cc
+++ b/content/public/test/download_test_observer.cc
@@ -32,7 +32,7 @@ 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".
@@ -41,7 +41,8 @@ void DenyDangerousDownload(scoped_refptr<DownloadManager> download_manager,
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());
}
}
@@ -162,7 +163,7 @@ void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
!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_) {

Powered by Google App Engine
This is Rietveld 408576698